diff options
| -rw-r--r-- | examples/apps/fpcunit/fpg_guitestrunner.pas | 3 | ||||
| -rw-r--r-- | prototypes/fpgui2/tests/edittest.lpr | 2 | ||||
| -rw-r--r-- | src/gui/gui_edit.pas | 6 | ||||
| -rw-r--r-- | src/gui/gui_tree.pas | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/examples/apps/fpcunit/fpg_guitestrunner.pas b/examples/apps/fpcunit/fpg_guitestrunner.pas index 15c24869..9380a114 100644 --- a/examples/apps/fpcunit/fpg_guitestrunner.pas +++ b/examples/apps/fpcunit/fpg_guitestrunner.pas @@ -373,7 +373,8 @@ var itm: TfpgMenuItem; begin FPopupMenu := TfpgPopupMenu.Create(nil); - +// FPopupMenu.FreeNotification(self); + itm := FPopupMenu.AddMenuItem(uiCollapseAll, '', @miCollapseAll); itm.Name := 'pmCollapseAll'; itm := FPopupMenu.AddMenuItem(uiExpandAll, '', @miExpandAll); diff --git a/prototypes/fpgui2/tests/edittest.lpr b/prototypes/fpgui2/tests/edittest.lpr index 24fb9db0..ede76f86 100644 --- a/prototypes/fpgui2/tests/edittest.lpr +++ b/prototypes/fpgui2/tests/edittest.lpr @@ -421,7 +421,7 @@ begin // writeln(UTF8Length(edit2.text)); // writeln(Length(edit2.text)); - UTF8Insert('ö', edit2.Text, 15); +// UTF8Insert('ö', edit2.Text, 15); // left to right and right to left text in one // fpGUI doesn't handle this correctly yet. diff --git a/src/gui/gui_edit.pas b/src/gui/gui_edit.pas index 19281258..b9c608af 100644 --- a/src/gui/gui_edit.pas +++ b/src/gui/gui_edit.pas @@ -84,7 +84,7 @@ type procedure HandleKeyChar(var AText: TfpgChar; var shiftstate: TShiftState; var consumed: Boolean); override; procedure HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: Boolean); override; procedure HandleLMouseDown(x, y: integer; shiftstate: TShiftState); override; - procedure HandleRMouseDown(x, y: integer; shiftstate: TShiftState); override; + procedure HandleRMouseUp(x, y: integer; shiftstate: TShiftState); override; procedure HandleMouseMove(x, y: integer; btnstate: word; shiftstate: TShiftState); override; procedure HandleDoubleClick(x, y: integer; button: word; shiftstate: TShiftState); override; procedure HandleMouseEnter; override; @@ -872,9 +872,9 @@ begin RePaint; end; -procedure TfpgBaseEdit.HandleRMouseDown(x, y: integer; shiftstate: TShiftState); +procedure TfpgBaseEdit.HandleRMouseUp(x, y: integer; shiftstate: TShiftState); begin - inherited HandleRMouseDown(x, y, shiftstate); + inherited HandleRMouseUp(x, y, shiftstate); if Assigned(PopupMenu) then PopupMenu.ShowAt(self, x, y) else diff --git a/src/gui/gui_tree.pas b/src/gui/gui_tree.pas index ecc5004a..25d8c839 100644 --- a/src/gui/gui_tree.pas +++ b/src/gui/gui_tree.pas @@ -191,7 +191,7 @@ type procedure HandleResize(awidth, aheight: TfpgCoord); override; procedure HandleLMouseUp(x, y: integer; shiftstate: TShiftState); override; procedure HandleLMouseDown(x, y: integer; shiftstate: TShiftState); override; - procedure HandleRMouseDown(x, y: integer; shiftstate: TShiftState); override; + procedure HandleRMouseUp(x, y: integer; shiftstate: TShiftState); override; procedure HandleDoubleClick(x, y: integer; button: word; shiftstate: TShiftState); override; procedure HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleMouseScroll(x, y: integer; shiftstate: TShiftState; delta: smallint); override; @@ -1213,9 +1213,9 @@ begin RePaint; end; -procedure TfpgTreeView.HandleRMouseDown(x, y: integer; shiftstate: TShiftState); +procedure TfpgTreeView.HandleRMouseUp(x, y: integer; shiftstate: TShiftState); begin - inherited HandleRMouseDown(x, y, shiftstate); + inherited HandleRMouseUp(x, y, shiftstate); if Assigned(PopupMenu) then PopupMenu.ShowAt(self, x, y); end; |