From: Andreas H. <ah...@us...> - 2004-01-12 18:33:41
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv10133/run Modified Files: JvExButtons.pas JvExCheckLst.pas JvExComCtrls.pas JvExControls.pas JvExExtCtrls.pas JvExForms.pas JvExGrids.pas JvExMask.pas JvExStdCtrls.pas Log Message: New macros that allow single class extensions Index: JvExButtons.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExButtons.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvExButtons.pas 12 Jan 2004 11:28:47 -0000 1.6 --- JvExButtons.pas 12 Jan 2004 18:33:36 -0000 1.7 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 74,81 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 74,77 ---- *************** *** 110,116 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 106,112 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 139,146 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 135,138 ---- *************** *** 261,270 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExSpeedButton.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 253,256 ---- *************** *** 383,392 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExBitBtn.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 369,372 ---- Index: JvExCheckLst.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExCheckLst.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvExCheckLst.pas 12 Jan 2004 11:28:47 -0000 1.6 --- JvExCheckLst.pas 12 Jan 2004 18:33:36 -0000 1.7 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 87,94 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 87,90 ---- *************** *** 209,218 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCheckListBox.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 205,208 ---- Index: JvExComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExComCtrls.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvExComCtrls.pas 12 Jan 2004 11:28:47 -0000 1.8 --- JvExComCtrls.pas 12 Jan 2004 18:33:36 -0000 1.9 *************** *** 66,72 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 66,72 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} [...1526 lines suppressed...] - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 9812,9815 ---- *************** *** 10394,10403 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExComboBoxEx.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 10020,10023 ---- Index: JvExControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExControls.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JvExControls.pas 12 Jan 2004 11:28:48 -0000 1.10 --- JvExControls.pas 12 Jan 2004 18:33:36 -0000 1.11 *************** *** 101,107 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 101,107 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 117,124 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 117,120 ---- *************** *** 153,159 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 149,155 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 182,189 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 178,181 ---- *************** *** 228,234 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 220,226 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 244,251 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 236,239 ---- *************** *** 280,286 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 268,274 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 309,316 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 297,300 ---- *************** *** 347,353 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 331,337 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 376,383 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 360,363 ---- *************** *** 649,658 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExControl.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 629,632 ---- *************** *** 771,780 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExWinControl.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 745,748 ---- *************** *** 986,995 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExGraphicControl.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 954,957 ---- *************** *** 1108,1117 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomControl.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1070,1073 ---- *************** *** 1294,1303 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExHintWindow.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1250,1253 ---- Index: JvExExtCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExExtCtrls.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvExExtCtrls.pas 12 Jan 2004 11:28:48 -0000 1.6 --- JvExExtCtrls.pas 12 Jan 2004 18:33:36 -0000 1.7 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 74,81 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 74,77 ---- *************** *** 110,116 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 106,112 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 126,133 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 122,125 ---- *************** *** 162,168 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 154,160 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 178,185 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 170,173 ---- *************** *** 214,220 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 202,208 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 230,237 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 218,221 ---- *************** *** 266,272 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 250,256 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 295,302 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 279,282 ---- *************** *** 333,339 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 313,319 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 362,369 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 342,345 ---- *************** *** 400,406 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 376,382 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 429,436 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 405,408 ---- *************** *** 474,480 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 446,452 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 503,510 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 475,478 ---- *************** *** 548,554 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 516,522 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 564,571 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 532,535 ---- *************** *** 581,585 **** end; ! {$DEFINE REINTRODUCE_HITTEST} TJvExCustomControlBar = class(TCustomControlBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} --- 545,549 ---- end; ! TJvExCustomControlBar = class(TCustomControlBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} *************** *** 601,607 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 565,571 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 630,637 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 594,597 ---- *************** *** 647,652 **** --- 607,617 ---- procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; {$ENDIF VisualCLX} + {$IFDEF VisualCLX} + protected + function HitTest(X, Y: Integer): Boolean; overload; dynamic; + {$ENDIF VisualCLX} end; + TJvExControlBar = class(TControlBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} *************** *** 668,674 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 633,639 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 697,704 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 662,665 ---- *************** *** 714,720 **** procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; {$ENDIF VisualCLX} end; ! {$UNDEF REINTRODUCE_HITTEST} {$IFDEF VCL} TJvExPage = class(TPage, IJvWinControlEvents, IJvControlEvents) --- 675,685 ---- procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; {$ENDIF VisualCLX} + {$IFDEF VisualCLX} + protected + function HitTest(X, Y: Integer): Boolean; overload; dynamic; + {$ENDIF VisualCLX} end; ! {$IFDEF VCL} TJvExPage = class(TPage, IJvWinControlEvents, IJvControlEvents) *************** *** 737,743 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 702,708 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 766,773 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 731,734 ---- *************** *** 804,810 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 765,771 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 833,840 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 794,797 ---- *************** *** 871,877 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 828,834 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 900,907 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 857,860 ---- *************** *** 939,945 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 892,898 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 955,962 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 908,911 ---- *************** *** 991,997 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 940,946 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 1020,1027 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 969,972 ---- *************** *** 1065,1071 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 1010,1016 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 1094,1101 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 1039,1042 ---- *************** *** 1139,1145 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 1080,1086 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 1168,1175 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 1109,1112 ---- *************** *** 1213,1219 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 1150,1156 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 1242,1249 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 1179,1182 ---- *************** *** 1366,1375 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExShape.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1299,1302 ---- *************** *** 1488,1497 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExPaintBox.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1415,1418 ---- *************** *** 1610,1619 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExImage.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1531,1534 ---- *************** *** 1732,1741 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExBevel.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1647,1650 ---- *************** *** 1854,1863 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomPanel.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1763,1766 ---- *************** *** 2040,2049 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExPanel.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1943,1946 ---- *************** *** 2226,2235 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomRadioGroup.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 2123,2126 ---- *************** *** 2440,2449 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExRadioGroup.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 2331,2334 ---- *************** *** 2654,2663 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExSplitter.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 2539,2542 ---- *************** *** 2683,2687 **** end; {$ENDIF VCL} ! {$DEFINE REINTRODUCE_HITTEST} {$IFDEF VCL} --- 2562,2566 ---- end; {$ENDIF VCL} ! {$IFDEF VCL} *************** *** 2777,2786 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomControlBar.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 2656,2659 ---- *************** *** 2870,2873 **** --- 2743,2754 ---- {$ENDIF VCL} + {$IFDEF VisualCLX} + function TJvExCustomControlBar.HitTest(X, Y: Integer): Boolean; + begin + Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); + end; + {$ENDIF VisualCLX} + + {$IFDEF VCL} *************** *** 2963,2972 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExControlBar.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 2844,2847 ---- *************** *** 3056,3060 **** {$ENDIF VCL} ! {$UNDEF REINTRODUCE_HITTEST} {$IFDEF VCL} --- 2931,2942 ---- {$ENDIF VCL} ! {$IFDEF VisualCLX} ! function TJvExControlBar.HitTest(X, Y: Integer): Boolean; ! begin ! Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); ! end; ! {$ENDIF VisualCLX} ! ! {$IFDEF VCL} *************** *** 3151,3160 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExPage.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3033,3036 ---- *************** *** 3337,3346 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExNotebook.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3213,3216 ---- *************** *** 3523,3532 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExHeader.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3393,3396 ---- *************** *** 3710,3719 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExBoundLabel.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3574,3577 ---- *************** *** 3832,3841 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomLabeledEdit.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3690,3693 ---- *************** *** 4046,4055 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExLabeledEdit.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 3898,3901 ---- *************** *** 4260,4269 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomColorBox.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 4106,4109 ---- *************** *** 4474,4483 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExColorBox.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 4314,4317 ---- Index: JvExForms.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExForms.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvExForms.pas 12 Jan 2004 11:28:48 -0000 1.6 --- JvExForms.pas 12 Jan 2004 18:33:36 -0000 1.7 *************** *** 65,71 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 65,71 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 94,101 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 94,97 ---- *************** *** 139,145 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 135,141 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 168,175 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 164,167 ---- *************** *** 213,219 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 205,211 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 242,249 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 234,237 ---- *************** *** 287,293 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 275,281 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 316,323 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 304,307 ---- *************** *** 361,367 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 345,351 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 390,397 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 374,377 ---- *************** *** 428,434 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 408,414 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 457,464 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 437,440 ---- *************** *** 495,501 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 471,477 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 524,531 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 500,503 ---- *************** *** 646,655 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExScrollingWinControl.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 618,621 ---- *************** *** 860,869 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExScrollBox.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 826,829 ---- *************** *** 1074,1083 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomFrame.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1034,1037 ---- *************** *** 1288,1297 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExFrame.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1242,1245 ---- *************** *** 1502,1511 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomForm.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1450,1453 ---- *************** *** 1688,1697 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExForm.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1630,1633 ---- *************** *** 1874,1883 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExToolWindow.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1810,1813 ---- Index: JvExGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExGrids.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvExGrids.pas 12 Jan 2004 11:28:48 -0000 1.5 --- JvExGrids.pas 12 Jan 2004 18:33:36 -0000 1.6 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 87,94 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 87,90 ---- *************** *** 132,138 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 128,134 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 161,168 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 157,160 ---- *************** *** 201,207 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 193,199 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 230,237 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 222,225 ---- *************** *** 268,274 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 256,262 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 297,304 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 285,288 ---- *************** *** 344,350 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 328,334 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 373,380 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 357,360 ---- *************** *** 411,417 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 391,397 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 440,447 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 420,423 ---- *************** *** 555,564 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExInplaceEdit.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 531,534 ---- *************** *** 769,778 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomGrid.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 739,742 ---- *************** *** 957,966 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomDrawGrid.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 921,924 ---- *************** *** 1143,1152 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExInplaceEditList.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1101,1104 ---- *************** *** 1359,1368 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExDrawGrid.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1311,1314 ---- *************** *** 1545,1554 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExStringGrid.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 1491,1494 ---- Index: JvExMask.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExMask.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvExMask.pas 12 Jan 2004 11:28:48 -0000 1.5 --- JvExMask.pas 12 Jan 2004 18:33:36 -0000 1.6 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 87,94 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 87,90 ---- *************** *** 111,116 **** --- 107,117 ---- destructor Destroy; override; {$ENDIF VisualCLX} + private + FBeepOnError: Boolean; + protected + property BeepOnError: Boolean read FBeepOnError write FBeepOnError; end; + TJvExMaskEdit = class(TMaskEdit, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} *************** *** 132,138 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 133,139 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 161,168 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 162,165 ---- *************** *** 185,188 **** --- 182,189 ---- destructor Destroy; override; {$ENDIF VisualCLX} + private + FBeepOnError: Boolean; + protected + property BeepOnError: Boolean read FBeepOnError write FBeepOnError; end; *************** *** 283,292 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExCustomMaskEdit.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 284,287 ---- *************** *** 497,506 **** {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - function TJvExMaskEdit.HitTest(X, Y: Integer): Boolean; - begin - Result := (X >= 0) and (Y >= 0) and (X < Width) and (Y < Height); - end; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} --- 492,495 ---- Index: JvExStdCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExStdCtrls.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvExStdCtrls.pas 12 Jan 2004 11:28:48 -0000 1.6 --- JvExStdCtrls.pas 12 Jan 2004 18:33:36 -0000 1.7 *************** *** 58,64 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 58,64 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 87,94 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 87,90 ---- *************** *** 132,138 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } --- 128,134 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} { IJvWinControlEvents } *************** *** 161,168 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 157,160 ---- *************** *** 207,213 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public --- 199,205 ---- procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} public *************** *** 223,230 **** function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} - {$IFDEF REINTRODUCE_HITTEST} - protected - function HitTest(X, Y: Integer): Boolean; overload; dynamic; - {$ENDIF REINTRODUCE_HITTEST} {$IF not declared(PatchedVCLX)} private --- 215,218 ---- *************** *** 259,265 **** procedure MouseLeave(Control: TControl); dynamic; {$IFNDEF HASAUTOSIZE} ! {$IFNDEF COMPILER6_UP} procedure SetAutoSize(Value: Boolean); virtual; ! {$ENDIF !COMPILER6_UP} {$... [truncated message content] |