From: Andreas H. <ah...@us...> - 2004-09-03 22:50:39
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19343/run Modified Files: JvInspector.pas Log Message: Fixed Mantis #1894 (ScrollBar does not work in TJvInspectorItem - ListBox) Fixed missing StopTracking call Index: JvInspector.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInspector.pas,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** JvInspector.pas 1 Sep 2004 15:06:43 -0000 1.125 --- JvInspector.pas 3 Sep 2004 22:50:27 -0000 1.126 *************** *** 852,861 **** procedure EditFocusLost(Sender: TObject); dynamic; procedure EditKillFocus(Sender: TObject); ! procedure EditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); ! virtual; procedure EditMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); virtual; ! procedure EditMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); ! virtual; procedure EditMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); virtual; --- 852,859 ---- procedure EditFocusLost(Sender: TObject); dynamic; procedure EditKillFocus(Sender: TObject); ! procedure EditKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); virtual; procedure EditMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); virtual; ! procedure EditMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); virtual; procedure EditMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); virtual; *************** *** 911,916 **** function IsCategory: Boolean; virtual; procedure ListExit(Sender: TObject); virtual; ! procedure ListMouseUp(Sender: TObject; Button: TMouseButton; ! Shift: TShiftState; X, Y: Integer); virtual; procedure ListValueSelect(Sender: TObject); virtual; procedure ListDeactivate(Sender: TObject); virtual; --- 909,914 ---- function IsCategory: Boolean; virtual; procedure ListExit(Sender: TObject); virtual; ! {procedure ListMouseUp(Sender: TObject; Button: TMouseButton; ! Shift: TShiftState; X, Y: Integer); virtual;} procedure ListValueSelect(Sender: TObject); virtual; procedure ListDeactivate(Sender: TObject); virtual; *************** *** 3494,3498 **** if (Item <> nil) and (PtInRect(Item.Rects[iprNameArea], Point(X, Y)) or PtInRect(Item.Rects[iprValueArea], Point(X, Y))) then ! Item.MouseUp(Button, Shift, X, Y); end; --- 3492,3498 ---- if (Item <> nil) and (PtInRect(Item.Rects[iprNameArea], Point(X, Y)) or PtInRect(Item.Rects[iprValueArea], Point(X, Y))) then ! Item.MouseUp(Button, Shift, X, Y) ! else if (Selected <> nil) and Selected.Tracking and (not PtInRect(ClientRect, Point(X, Y))) then ! Selected.StopTracking; end; *************** *** 5810,5820 **** FDroppedDown := True; InvalidateItem; - {$IFDEF VCL} - Windows.SetFocus(EditCtrl.Handle); - SetCaptureControl(ListBox); - {$ENDIF VCL} - {$IFDEF VisualCLX} EditCtrl.SetFocus; - {$ENDIF VisualCLX} Inspector.Selecting := False; end; --- 5810,5814 ---- *************** *** 6009,6014 **** WM_GETDLGCODE: begin ! if Inspector.WantTabs then ! Msg.Result := Msg.Result or DLGC_WANTTAB; end; end; --- 6003,6008 ---- WM_GETDLGCODE: begin ! if Inspector.WantTabs then ! Msg.Result := Msg.Result or DLGC_WANTTAB; end; end; *************** *** 6346,6355 **** end; ! procedure TJvCustomInspectorItem.ListMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin if Button = mbLeft then CloseUp(PtInRect(ListBox.ClientRect, Point(X, Y))); ! end; procedure TJvCustomInspectorItem.ListValueSelect(Sender: TObject); --- 6340,6349 ---- end; ! {procedure TJvCustomInspectorItem.ListMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin if Button = mbLeft then CloseUp(PtInRect(ListBox.ClientRect, Point(X, Y))); ! end;} procedure TJvCustomInspectorItem.ListValueSelect(Sender: TObject); *************** *** 7275,7279 **** ListBox.Parent := EditCtrl.Parent; {$ENDIF VisualCLX} ! // TListBox(ListBox).OnMouseUp := ListMouseUp; TJvInspectorListBox(ListBox).OnValueSelect := ListValueSelect; TJvInspectorListBox(ListBox).OnDeactivate := ListDeactivate; --- 7269,7273 ---- ListBox.Parent := EditCtrl.Parent; {$ENDIF VisualCLX} ! //TJvInspectorListBox(ListBox).OnMouseUp := ListMouseUp; TJvInspectorListBox(ListBox).OnValueSelect := ListValueSelect; TJvInspectorListBox(ListBox).OnDeactivate := ListDeactivate; |