Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvBaseThumbnail.pas,1.10,1.11 JvExButtons.pas,1.18,1.19 JvExCheckLst.pas,1.18,1.19 JvExComCtrls.pas,1.20,1.21 JvExComboEdits.pas,1.3,1.4 JvExControls.pas,1.26,1.27 JvExDBGrids.pas,1.5,1.6 JvExExtCtrls.pas,1.18,1.19 JvExForms.pas,1.18,1.19 JvExGrids.pas,1.17,1.18 JvExMask.pas,1.20,1.21 JvExStdCtrls.pas,1.23,1.24 - Moved DoPaintBackground from TJvExControl to TJvExWinControl
|
From: Andreas H. <ah...@us...> - 2004-02-11 14:52:27
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32606/run Modified Files: JvBaseThumbnail.pas JvExButtons.pas JvExCheckLst.pas JvExComCtrls.pas JvExComboEdits.pas JvExControls.pas JvExDBGrids.pas JvExExtCtrls.pas JvExForms.pas JvExGrids.pas JvExMask.pas JvExStdCtrls.pas Log Message: Moved DoPaintBackground from TJvExControl to TJvExWinControl Index: JvExCheckLst.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExCheckLst.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvExCheckLst.pas 20 Jan 2004 20:42:22 -0000 1.18 --- JvExCheckLst.pas 11 Feb 2004 14:48:12 -0000 1.19 *************** *** 113,117 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 113,116 ---- *************** *** 126,129 **** --- 125,129 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 318,330 **** begin end; - - function TJvExCheckListBox.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCheckListBox.DoBoundsChanged; begin --- 318,321 ---- *************** *** 343,346 **** --- 334,347 ---- end; + function TJvExCheckListBox.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCheckListBox.Create(AOwner: TComponent); Index: JvExDBGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExDBGrids.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvExDBGrids.pas 20 Jan 2004 20:42:22 -0000 1.5 --- JvExDBGrids.pas 11 Feb 2004 14:48:12 -0000 1.6 *************** *** 113,117 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 113,116 ---- *************** *** 126,129 **** --- 125,129 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 204,208 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 204,207 ---- *************** *** 217,220 **** --- 216,220 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 403,415 **** begin end; - - function TJvExCustomDBGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomDBGrid.DoBoundsChanged; begin --- 403,406 ---- *************** *** 428,431 **** --- 419,432 ---- end; + function TJvExCustomDBGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomDBGrid.Create(AOwner: TComponent); begin *************** *** 607,619 **** begin end; - - function TJvExDBGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExDBGrid.DoBoundsChanged; begin --- 608,611 ---- *************** *** 632,635 **** --- 624,637 ---- end; + function TJvExDBGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExDBGrid.Create(AOwner: TComponent); begin Index: JvExForms.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExForms.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvExForms.pas 20 Jan 2004 20:42:22 -0000 1.18 --- JvExForms.pas 11 Feb 2004 14:48:12 -0000 1.19 *************** *** 113,117 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 113,116 ---- *************** *** 126,129 **** --- 125,129 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 210,214 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 210,213 ---- *************** *** 223,226 **** --- 222,226 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 307,311 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 307,310 ---- *************** *** 320,323 **** --- 319,323 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 404,408 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 404,407 ---- *************** *** 417,420 **** --- 416,420 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 501,505 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 501,504 ---- *************** *** 514,517 **** --- 513,517 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 592,596 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 592,595 ---- *************** *** 605,608 **** --- 604,608 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 683,687 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 683,686 ---- *************** *** 696,699 **** --- 695,699 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 888,900 **** begin end; - - function TJvExScrollingWinControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExScrollingWinControl.DoBoundsChanged; begin --- 888,891 ---- *************** *** 913,916 **** --- 904,917 ---- end; + function TJvExScrollingWinControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExScrollingWinControl.Create(AOwner: TComponent); *************** *** 1115,1127 **** begin end; - - function TJvExScrollBox.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExScrollBox.DoBoundsChanged; begin --- 1116,1119 ---- *************** *** 1140,1143 **** --- 1132,1145 ---- end; + function TJvExScrollBox.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExScrollBox.Create(AOwner: TComponent); *************** *** 1342,1354 **** begin end; - - function TJvExCustomFrame.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomFrame.DoBoundsChanged; begin --- 1344,1347 ---- *************** *** 1367,1370 **** --- 1360,1373 ---- end; + function TJvExCustomFrame.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCustomFrame.Create(AOwner: TComponent); *************** *** 1569,1581 **** begin end; - - function TJvExFrame.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExFrame.DoBoundsChanged; begin --- 1572,1575 ---- *************** *** 1594,1597 **** --- 1588,1601 ---- end; + function TJvExFrame.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExFrame.Create(AOwner: TComponent); *************** *** 1796,1808 **** begin end; - - function TJvExCustomForm.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomForm.DoBoundsChanged; begin --- 1800,1803 ---- *************** *** 1821,1824 **** --- 1816,1829 ---- end; + function TJvExCustomForm.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomForm.Create(AOwner: TComponent); begin *************** *** 2000,2012 **** begin end; - - function TJvExForm.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExForm.DoBoundsChanged; begin --- 2005,2008 ---- *************** *** 2025,2028 **** --- 2021,2034 ---- end; + function TJvExForm.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExForm.Create(AOwner: TComponent); begin *************** *** 2204,2216 **** begin end; - - function TJvExToolWindow.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExToolWindow.DoBoundsChanged; begin --- 2210,2213 ---- *************** *** 2229,2232 **** --- 2226,2239 ---- end; + function TJvExToolWindow.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExToolWindow.Create(AOwner: TComponent); Index: JvExControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExControls.pas,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** JvExControls.pas 21 Jan 2004 08:43:47 -0000 1.26 --- JvExControls.pas 11 Feb 2004 14:48:12 -0000 1.27 *************** *** 89,93 **** procedure MouseEnter(AControl: TControl); procedure MouseLeave(AControl: TControl); - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; // WM_ERASEBKGND procedure DoFocusChanged(Control: TWinControl); {$IFDEF VCL} --- 89,92 ---- *************** *** 107,110 **** --- 106,110 ---- procedure DoSetFocus(FocusedWnd: HWND); // WM_SETFOCUS procedure DoKillFocus(FocusedWnd: HWND); // WM_KILLFOCUS + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; // WM_ERASEBKGND end; *************** *** 192,196 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 192,195 ---- *************** *** 278,282 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 277,280 ---- *************** *** 291,294 **** --- 289,293 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 357,361 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 356,359 ---- *************** *** 450,454 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 448,451 ---- *************** *** 463,466 **** --- 460,464 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 541,545 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 539,542 ---- *************** *** 554,557 **** --- 551,555 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 697,712 **** Result := Ord(WantKey(CharCode, KeyDataToShiftState(KeyData), WideChar(CharCode))); // CM_FOCUSCHANGED: handled by a message handler in the JvExVCL classes - - WM_ERASEBKGND: - begin - Canvas := TCanvas.Create; - try - Canvas.Handle := HDC(PMsg^.WParam); - PMsg^.Result := Ord(DoPaintBackground(Canvas, PMsg^.LParam)); - finally - Canvas.Handle := 0; - Canvas.Free; - end; - end else CallInherited := True; --- 695,698 ---- *************** *** 771,775 **** end; end; - WM_SETFOCUS: begin --- 757,760 ---- *************** *** 784,788 **** DoKillFocus(HWND(PMsg^.WParam)); end; - WM_SIZE: begin --- 769,772 ---- *************** *** 791,794 **** --- 775,789 ---- Result := InheritMsg(Instance, Msg, WParam, LParam); end; + WM_ERASEBKGND: + begin + Canvas := TCanvas.Create; + try + Canvas.Handle := HDC(PMsg^.WParam); + PMsg^.Result := Ord(DoPaintBackground(Canvas, PMsg^.LParam)); + finally + Canvas.Handle := 0; + Canvas.Free; + end; + end; else CallInherited := True; *************** *** 1201,1213 **** end; - function TJvExControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExControl.Create(AOwner: TComponent); begin --- 1196,1199 ---- *************** *** 1389,1401 **** begin end; - - function TJvExWinControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExWinControl.DoBoundsChanged; begin --- 1375,1378 ---- *************** *** 1414,1417 **** --- 1391,1404 ---- end; + function TJvExWinControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExWinControl.Create(AOwner: TComponent); *************** *** 1561,1573 **** end; - function TJvExGraphicControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExGraphicControl.Create(AOwner: TComponent); begin --- 1548,1551 ---- *************** *** 1766,1778 **** begin end; - - function TJvExCustomControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomControl.DoBoundsChanged; begin --- 1744,1747 ---- *************** *** 1791,1794 **** --- 1760,1773 ---- end; + function TJvExCustomControl.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomControl.Create(AOwner: TComponent); begin *************** *** 1970,1982 **** begin end; - - function TJvExHintWindow.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExHintWindow.DoBoundsChanged; begin --- 1949,1952 ---- *************** *** 1995,1998 **** --- 1965,1978 ---- end; + function TJvExHintWindow.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExHintWindow.Create(AOwner: TComponent); begin Index: JvExMask.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExMask.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvExMask.pas 20 Jan 2004 20:42:23 -0000 1.20 --- JvExMask.pas 11 Feb 2004 14:48:12 -0000 1.21 *************** *** 110,114 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 110,113 ---- *************** *** 123,126 **** --- 122,126 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 235,239 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 235,238 ---- *************** *** 248,251 **** --- 247,251 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 474,486 **** begin end; - - function TJvExCustomMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomMaskEdit.DoBoundsChanged; begin --- 474,477 ---- *************** *** 499,502 **** --- 490,503 ---- end; + function TJvExCustomMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCustomMaskEdit.Create(AOwner: TComponent); *************** *** 792,804 **** begin end; - - function TJvExMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExMaskEdit.DoBoundsChanged; begin --- 793,796 ---- *************** *** 817,820 **** --- 809,822 ---- end; + function TJvExMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExMaskEdit.Create(AOwner: TComponent); Index: JvExComboEdits.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExComboEdits.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvExComboEdits.pas 20 Jan 2004 20:42:22 -0000 1.3 --- JvExComboEdits.pas 11 Feb 2004 14:48:12 -0000 1.4 *************** *** 109,113 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 109,112 ---- *************** *** 122,125 **** --- 121,125 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 227,231 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 227,230 ---- *************** *** 240,243 **** --- 239,243 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 346,350 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 346,349 ---- *************** *** 359,362 **** --- 358,362 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 471,475 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 471,474 ---- *************** *** 484,487 **** --- 483,487 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 707,719 **** begin end; - - function TJvExCustomComboEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomComboEdit.DoBoundsChanged; begin --- 707,710 ---- *************** *** 732,735 **** --- 723,736 ---- end; + function TJvExCustomComboEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCustomComboEdit.Create(AOwner: TComponent); *************** *** 1011,1023 **** begin end; - - function TJvExComboEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExComboEdit.DoBoundsChanged; begin --- 1012,1015 ---- *************** *** 1036,1039 **** --- 1028,1041 ---- end; + function TJvExComboEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExComboEdit.Create(AOwner: TComponent); *************** *** 1323,1335 **** begin end; - - function TJvExCustomComboMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomComboMaskEdit.DoBoundsChanged; begin --- 1325,1328 ---- *************** *** 1348,1351 **** --- 1341,1354 ---- end; + function TJvExCustomComboMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCustomComboMaskEdit.Create(AOwner: TComponent); *************** *** 1641,1653 **** begin end; - - function TJvExComboMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExComboMaskEdit.DoBoundsChanged; begin --- 1644,1647 ---- *************** *** 1666,1669 **** --- 1660,1673 ---- end; + function TJvExComboMaskEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExComboMaskEdit.Create(AOwner: TComponent); Index: JvExGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExGrids.pas,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** JvExGrids.pas 20 Jan 2004 20:42:22 -0000 1.17 --- JvExGrids.pas 11 Feb 2004 14:48:12 -0000 1.18 *************** *** 113,117 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 113,116 ---- *************** *** 126,129 **** --- 125,129 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 210,214 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 210,213 ---- *************** *** 223,226 **** --- 222,226 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 303,307 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 303,306 ---- *************** *** 316,319 **** --- 315,319 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 394,398 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 394,397 ---- *************** *** 407,410 **** --- 406,410 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 493,497 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 493,496 ---- *************** *** 506,509 **** --- 505,509 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 584,588 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 584,587 ---- *************** *** 597,600 **** --- 596,600 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 783,795 **** begin end; - - function TJvExInplaceEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExInplaceEdit.DoBoundsChanged; begin --- 783,786 ---- *************** *** 808,811 **** --- 799,812 ---- end; + function TJvExInplaceEdit.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExInplaceEdit.Create(AOwner: TComponent); *************** *** 1010,1022 **** begin end; - - function TJvExCustomGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomGrid.DoBoundsChanged; begin --- 1011,1014 ---- *************** *** 1035,1038 **** --- 1027,1040 ---- end; + function TJvExCustomGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomGrid.Create(AOwner: TComponent); begin *************** *** 1216,1228 **** begin end; - - function TJvExCustomDrawGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomDrawGrid.DoBoundsChanged; begin --- 1218,1221 ---- *************** *** 1241,1244 **** --- 1234,1247 ---- end; + function TJvExCustomDrawGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomDrawGrid.Create(AOwner: TComponent); begin *************** *** 1420,1432 **** begin end; - - function TJvExInplaceEditList.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExInplaceEditList.DoBoundsChanged; begin --- 1423,1426 ---- *************** *** 1445,1448 **** --- 1439,1452 ---- end; + function TJvExInplaceEditList.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExInplaceEditList.Create(AOwner: TComponent); *************** *** 1649,1661 **** begin end; - - function TJvExDrawGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExDrawGrid.DoBoundsChanged; begin --- 1653,1656 ---- *************** *** 1674,1677 **** --- 1669,1682 ---- end; + function TJvExDrawGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExDrawGrid.Create(AOwner: TComponent); begin *************** *** 1853,1865 **** begin end; - - function TJvExStringGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExStringGrid.DoBoundsChanged; begin --- 1858,1861 ---- *************** *** 1878,1881 **** --- 1874,1887 ---- end; + function TJvExStringGrid.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExStringGrid.Create(AOwner: TComponent); begin Index: JvBaseThumbnail.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBaseThumbnail.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JvBaseThumbnail.pas 13 Jan 2004 21:13:06 -0000 1.10 --- JvBaseThumbnail.pas 11 Feb 2004 14:48:12 -0000 1.11 *************** *** 136,140 **** protected function HitTest(X, Y: Integer): Boolean; override; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; --- 136,139 ---- *************** *** 438,447 **** end; - function TJvBaseThumbImage.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - inherited DoPaintBackground(Canvas, Param); - Result := True; - end; - procedure TJvBaseThumbImage.MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); --- 437,440 ---- Index: JvExComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExComCtrls.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvExComCtrls.pas 20 Jan 2004 20:42:22 -0000 1.20 --- JvExComCtrls.pas 11 Feb 2004 14:48:12 -0000 1.21 *************** *** 121,125 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 121,124 ---- *************** *** 134,137 **** --- 133,137 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; [...1780 lines suppressed...] procedure TJvExComboBoxEx.DoBoundsChanged; begin --- 11876,11879 ---- *************** *** 11886,11889 **** --- 11892,11905 ---- end; + function TJvExComboBoxEx.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExComboBoxEx.Create(AOwner: TComponent); Index: JvExExtCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExExtCtrls.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvExExtCtrls.pas 20 Jan 2004 20:42:22 -0000 1.18 --- JvExExtCtrls.pas 11 Feb 2004 14:48:12 -0000 1.19 *************** *** 94,98 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 94,97 ---- *************** *** 161,165 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 160,163 ---- *************** *** 228,232 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 226,229 ---- *************** *** 295,299 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 292,295 ---- *************** *** 381,385 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 377,380 ---- *************** *** 394,397 **** --- 389,393 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 472,476 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 468,471 ---- *************** *** 485,488 **** --- 480,484 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 563,567 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 559,562 ---- *************** *** 576,579 **** --- 571,575 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 660,664 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 656,659 ---- *************** *** 673,676 **** --- 668,672 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 738,742 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 734,737 ---- *************** *** 825,829 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 820,823 ---- *************** *** 838,841 **** --- 832,836 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} *************** *** 921,925 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 916,919 ---- *************** *** 934,937 **** --- 928,932 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} *************** *** 1018,1022 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1013,1016 ---- *************** *** 1031,1034 **** --- 1025,1029 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 1109,1113 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1104,1107 ---- *************** *** 1122,1125 **** --- 1116,1120 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 1200,1204 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1195,1198 ---- *************** *** 1213,1216 **** --- 1207,1211 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; end; *************** *** 1273,1277 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1268,1271 ---- *************** *** 1359,1363 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1353,1356 ---- *************** *** 1372,1375 **** --- 1365,1369 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 1456,1460 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1450,1453 ---- *************** *** 1469,1472 **** --- 1462,1466 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 1553,1557 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1547,1550 ---- *************** *** 1566,1569 **** --- 1559,1563 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 1650,1654 **** procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; procedure DoFocusChanged(Control: TWinControl); dynamic; - function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; public constructor Create(AOwner: TComponent); override; --- 1644,1647 ---- *************** *** 1663,1666 **** --- 1656,1660 ---- procedure DoKillFocus(FocusedWnd: HWND); dynamic; procedure DoBoundsChanged; dynamic; + function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; {$IFDEF VisualCLX} private *************** *** 1801,1813 **** end; - function TJvExShape.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExShape.Create(AOwner: TComponent); begin --- 1795,1798 ---- *************** *** 1933,1945 **** end; - function TJvExPaintBox.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExPaintBox.Create(AOwner: TComponent); begin --- 1918,1921 ---- *************** *** 2065,2077 **** end; - function TJvExImage.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExImage.Create(AOwner: TComponent); begin --- 2041,2044 ---- *************** *** 2197,2209 **** end; - function TJvExBevel.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; - constructor TJvExBevel.Create(AOwner: TComponent); begin --- 2164,2167 ---- *************** *** 2385,2397 **** begin end; - - function TJvExCustomPanel.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomPanel.DoBoundsChanged; begin --- 2343,2346 ---- *************** *** 2410,2413 **** --- 2359,2372 ---- end; + function TJvExCustomPanel.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExCustomPanel.Create(AOwner: TComponent); begin *************** *** 2589,2601 **** begin end; - - function TJvExPanel.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExPanel.DoBoundsChanged; begin --- 2548,2551 ---- *************** *** 2614,2617 **** --- 2564,2577 ---- end; + function TJvExPanel.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + constructor TJvExPanel.Create(AOwner: TComponent); begin *************** *** 2793,2805 **** begin end; - - function TJvExCustomRadioGroup.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExCustomRadioGroup.DoBoundsChanged; begin --- 2753,2756 ---- *************** *** 2818,2821 **** --- 2769,2782 ---- end; + function TJvExCustomRadioGroup.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExCustomRadioGroup.Create(AOwner: TComponent); *************** *** 3020,3032 **** begin end; - - function TJvExRadioGroup.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; - begin - {$IFDEF VCL} - Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; - {$ELSE} - Result := False; // Qt allways paints the background - {$ENDIF VCL} - end; procedure TJvExRadioGroup.DoBoundsChanged; begin --- 2981,2984 ---- *************** *** 3045,3048 **** --- 2997,3010 ---- end; + function TJvExRadioGroup.DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; + begin + {$IFDEF VCL} + Result := InheritMsg(Self, WM_ERASEBKGND, Canvas.Handle, Param) <> 0; + {$ENDIF VCL} + {$IFDEF VisualCLX} + Result := False; // Qt allways paints the background + {$ENDIF VisualCLX} + end; + {$IFDEF VCL} constructor TJvExRadioGroup.Create(AOwner: TComponent); *************** *** 3191,3203 **** end; - function TJvExSpli... [truncated message content] |