Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvExButtons.pas,1.41,1.42 JvExCheckLst.pas,1.41,1.42 JvExComCtrls.pas,1.44,1.45 JvExControls.pas,1.70,1.71 JvExDBGrids.pas,1.27,1.28 JvExExtCtrls.pas,1.43,1.44 JvExForms.pas,1.42,1.43 JvExGrids.pas,1.40,1.41 JvExMask.pas,1.42,1.43 JvExStdCtrls.pas,1.46,1.47 - Clean VCL units.
|
From: André S. <asn...@us...> - 2004-09-09 17:24:18
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27225/JVCL3/run Modified Files: JvExButtons.pas JvExCheckLst.pas JvExComCtrls.pas JvExControls.pas JvExDBGrids.pas JvExExtCtrls.pas JvExForms.pas JvExGrids.pas JvExMask.pas JvExStdCtrls.pas Log Message: Clean VCL units. Index: JvExCheckLst.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExCheckLst.pas,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** JvExCheckLst.pas 4 Sep 2004 06:06:22 -0000 1.41 --- JvExCheckLst.pas 9 Sep 2004 17:24:00 -0000 1.42 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,64 **** uses - {$IFDEF VCL} Windows, Messages, - {$ENDIF VCL} Graphics, Controls, Forms, CheckLst, - {$IFDEF VisualCLX} - Types, Qt, QWindows, - {$ENDIF VisualCLX} Classes, SysUtils, JvTypes, JvThemes, JVCLVer, JvExControls; - {$IFDEF VCL} - {$DEFINE NeedMouseEnterLeave} - {$ENDIF VCL} - {$IFDEF VisualCLX} - {$IF not declared(PatchedVCLX)} - {$DEFINE NeedMouseEnterLeave} - {$IFEND} - {$ENDIF VisualCLX} type TJvExCheckListBox = class(TCheckListBox, IJvWinControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 43,54 ---- *************** *** 98,131 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 88,91 ---- *************** *** 133,137 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 93,96 ---- *************** *** 139,143 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 98,101 ---- *************** *** 147,160 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 105,111 ---- *************** *** 163,173 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FCanvas: TCanvas; - protected - procedure Paint; virtual; - property Canvas: TCanvas read FCanvas; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 114,117 ---- *************** *** 176,180 **** TJvExPubCheckListBox = class(TJvExCheckListBox) - {$IFDEF VCL} published property BiDiMode; --- 120,123 ---- *************** *** 185,189 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; --- 128,131 ---- *************** *** 191,195 **** implementation - {$IFDEF VCL} procedure TJvExCheckListBox.Dispatch(var Msg); asm --- 133,136 ---- *************** *** 321,445 **** {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExCheckListBox.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExCheckListBox.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExCheckListBox.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExCheckListBox.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExCheckListBox.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExCheckListBox.IsRightToLeft: Boolean; - begin - Result := False; - end; - - function TJvExCheckListBox.NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; - begin - Result := WidgetControl_NeedKey(Self, Key, Shift, KeyText, - inherited NeedKey(Key, Shift, KeyText)); - end; - - procedure TJvExCheckListBox.OnFontChanged(Sender: TObject); - var - FontChangedEvent: QEventH; - begin - FontChangedEvent := QEvent_create(QEventType_FontChanged); - if FontChangedEvent <> nil then - QApplication_postEvent(Handle, FontChangedEvent); - end; - - procedure TJvExCheckListBox.DoFontChanged(Sender: TObject); - begin - if Assigned(InternalFontChanged) then - InternalFontChanged(self); - end; - - procedure TJvExCheckListBox.BoundsChanged; - begin - inherited BoundsChanged; - DoBoundsChanged; - end; - - procedure TJvExCheckListBox.RecreateWnd; - begin - RecreateWidget; - end; - - procedure TJvExCheckListBox.CreateWidget; - begin - CreateWnd; - end; - - procedure TJvExCheckListBox.CreateWnd; - begin - inherited CreateWidget; - end; - - function TJvExCheckListBox.WidgetFlags: integer; - begin - Result := inherited WidgetFlags or - integer(WidgetFlags_WRepaintNoErase) or - integer(WidgetFlags_WMouseNoMask); - end; - - function TJvExCheckListBox.EventFilter(Sender: QObjectH; Event: QEventH): boolean; - begin - Result := inherited EventFilter(Sender, Event); - Result := Result or WidgetControl_EventFilter(Self, Sender, Event); - end; - - procedure TJvExCheckListBox.PaintWindow(PaintDevice: QPaintDeviceH); - begin - WidgetControl_PaintTo(self, PaintDevice, 0, 0); - end; - - procedure TJvExCheckListBox.PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - begin - WidgetControl_PaintTo(self, PaintDevice, X, Y); - end; - - {$ENDIF VisualCLX} procedure TJvExCheckListBox.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 262,265 ---- *************** *** 475,502 **** constructor TJvExCheckListBox.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); - {$IFDEF VisualCLX} - FCanvas := TControlCanvas.Create; - TControlCanvas(FCanvas).Control := Self; - InternalFontChanged := Font.OnChange; - Font.OnChange := OnFontChanged; - {$ENDIF VisualCLX} FHintColor := Application.HintColor; end; - {$IFDEF VisualCLX} - procedure TJvExCheckListBox.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExCheckListBox.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} destructor TJvExCheckListBox.Destroy; --- 295,302 ---- Index: JvExMask.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExMask.pas,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** JvExMask.pas 4 Sep 2004 06:06:24 -0000 1.42 --- JvExMask.pas 9 Sep 2004 17:24:01 -0000 1.43 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,63 **** uses - {$IFDEF VCL} Windows, Messages, Graphics, Controls, Forms, Mask, - {$ENDIF VCL} - {$IFDEF VisualCLX} - Qt, QGraphics, QControls, QForms, QMask, Types, QWindows, - {$ENDIF VisualCLX} Classes, SysUtils, JvTypes, JvThemes, JVCLVer, JvExControls; - {$IFDEF VCL} - {$DEFINE NeedMouseEnterLeave} - {$ENDIF VCL} - {$IFDEF VisualCLX} - {$IF not declared(PatchedVCLX)} - {$DEFINE NeedMouseEnterLeave} - {$IFEND} - {$ENDIF VisualCLX} type TJvExCustomMaskEdit = class(TCustomMaskEdit, IJvEditControlEvents, IJvWinControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 43,53 ---- *************** *** 97,130 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 87,90 ---- *************** *** 132,136 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 92,95 ---- *************** *** 138,142 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 97,100 ---- *************** *** 146,159 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 104,110 ---- *************** *** 162,179 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FCanvas: TCanvas; - protected - procedure Paint; virtual; - property Canvas: TCanvas read FCanvas; - {$ENDIF VisualCLX} private FClipboardCommands: TJvClipboardCommands; - {$IFDEF VisualCLX} - FEditRect: TRect; // EM_GETRECT - procedure EMGetRect(var Msg: TMessage); message EM_GETRECT; - procedure EMSetRect(var Msg: TMessage); message EM_SETRECT; - {$ENDIF VisualCLX} protected procedure DoUndo; dynamic; --- 113,118 ---- *************** *** 185,192 **** property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default [caCopy..caUndo]; - {$IFDEF VisualCLX} - public - procedure Clear; override; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 124,127 ---- *************** *** 201,205 **** TJvExPubCustomMaskEdit = class(TJvExCustomMaskEdit) - {$IFDEF VCL} published property BiDiMode; --- 136,139 ---- *************** *** 210,219 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; TJvExMaskEdit = class(TMaskEdit, IJvEditControlEvents, IJvWinControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 144,151 ---- *************** *** 253,286 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 185,188 ---- *************** *** 288,292 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 190,193 ---- *************** *** 294,298 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 195,198 ---- *************** *** 302,315 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 202,208 ---- *************** *** 318,335 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FCanvas: TCanvas; - protected - procedure Paint; virtual; - property Canvas: TCanvas read FCanvas; - {$ENDIF VisualCLX} private FClipboardCommands: TJvClipboardCommands; - {$IFDEF VisualCLX} - FEditRect: TRect; // EM_GETRECT - procedure EMGetRect(var Msg: TMessage); message EM_GETRECT; - procedure EMSetRect(var Msg: TMessage); message EM_SETRECT; - {$ENDIF VisualCLX} protected procedure DoUndo; dynamic; --- 211,216 ---- *************** *** 341,348 **** property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default [caCopy..caUndo]; - {$IFDEF VisualCLX} - public - procedure Clear; override; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 222,225 ---- *************** *** 357,361 **** TJvExPubMaskEdit = class(TJvExMaskEdit) - {$IFDEF VCL} published property BiDiMode; --- 234,237 ---- *************** *** 366,370 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; --- 242,245 ---- *************** *** 374,383 **** { The CONSTRUCTOR_CODE macro is used to extend the constructor by the macro content. } - {$UNDEF CONSTRUCTOR_CODE} - {$DEFINE CONSTRUCTOR_CODE - FBeepOnError := True; - FClipboardCommands := [caCopy..caUndo]; - } - {$IFDEF VCL} procedure TJvExCustomMaskEdit.Dispatch(var Msg); asm --- 249,252 ---- *************** *** 509,633 **** {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExCustomMaskEdit.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExCustomMaskEdit.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExCustomMaskEdit.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExCustomMaskEdit.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExCustomMaskEdit.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExCustomMaskEdit.IsRightToLeft: Boolean; - begin - Result := False; - end; - - function TJvExCustomMaskEdit.NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; - begin - Result := WidgetControl_NeedKey(Self, Key, Shift, KeyText, - inherited NeedKey(Key, Shift, KeyText)); - end; - - procedure TJvExCustomMaskEdit.OnFontChanged(Sender: TObject); - var - FontChangedEvent: QEventH; - begin - FontChangedEvent := QEvent_create(QEventType_FontChanged); - if FontChangedEvent <> nil then - QApplication_postEvent(Handle, FontChangedEvent); - end; - - procedure TJvExCustomMaskEdit.DoFontChanged(Sender: TObject); - begin - if Assigned(InternalFontChanged) then - InternalFontChanged(self); - end; - - procedure TJvExCustomMaskEdit.BoundsChanged; - begin - inherited BoundsChanged; - DoBoundsChanged; - end; - - procedure TJvExCustomMaskEdit.RecreateWnd; - begin - RecreateWidget; - end; - - procedure TJvExCustomMaskEdit.CreateWidget; - begin - CreateWnd; - end; - - procedure TJvExCustomMaskEdit.CreateWnd; - begin - inherited CreateWidget; - end; - - function TJvExCustomMaskEdit.WidgetFlags: integer; - begin - Result := inherited WidgetFlags or - integer(WidgetFlags_WRepaintNoErase) or - integer(WidgetFlags_WMouseNoMask); - end; - - function TJvExCustomMaskEdit.EventFilter(Sender: QObjectH; Event: QEventH): boolean; - begin - Result := inherited EventFilter(Sender, Event); - Result := Result or WidgetControl_EventFilter(Self, Sender, Event); - end; - - procedure TJvExCustomMaskEdit.PaintWindow(PaintDevice: QPaintDeviceH); - begin - WidgetControl_PaintTo(self, PaintDevice, 0, 0); - end; - - procedure TJvExCustomMaskEdit.PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - begin - WidgetControl_PaintTo(self, PaintDevice, X, Y); - end; - - {$ENDIF VisualCLX} procedure TJvExCustomMaskEdit.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 378,381 ---- *************** *** 663,690 **** constructor TJvExCustomMaskEdit.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); - {$IFDEF VisualCLX} - FCanvas := TControlCanvas.Create; - TControlCanvas(FCanvas).Control := Self; - InternalFontChanged := Font.OnChange; - Font.OnChange := OnFontChanged; - {$ENDIF VisualCLX} FHintColor := Application.HintColor; end; - {$IFDEF VisualCLX} - procedure TJvExCustomMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExCustomMaskEdit.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} destructor TJvExCustomMaskEdit.Destroy; --- 411,418 ---- *************** *** 697,706 **** // (ahuser) there is no caClear so we restrict it to caCut if caCut in ClipboardCommands then - {$IFDEF VCL} InheritMsg(Self, WM_CLEAR); - {$ENDIF VCL} - {$IFDEF VisualCLX} - inherited Clear; - {$ENDIF VisualCLX} end; --- 425,429 ---- *************** *** 734,769 **** end; - {$IFDEF VisualCLX} - - procedure TJvExCustomMaskEdit.Clear; - begin - DoClearText; - end; - - procedure TJvExCustomMaskEdit.EMGetRect(var Msg: TMessage); - begin - if Msg.LParam <> 0 then - begin - if IsRectEmpty(FEditRect) then - begin - PRect(Msg.LParam)^ := ClientRect; - if Self.BorderStyle = bsSingle then - InflateRect(PRect(Msg.LParam)^, -2, -2); - end - else - PRect(Msg.LParam)^ := FEditRect; - end; - end; - - procedure TJvExCustomMaskEdit.EMSetRect(var Msg: TMessage); - begin - if Msg.LParam <> 0 then - FEditRect := PRect(Msg.LParam)^ - else - FEditRect := ClientRect; - Invalidate; - end; - - {$ENDIF VisualCLX} procedure TJvExCustomMaskEdit.DoBeepOnError; --- 457,460 ---- *************** *** 780,784 **** - {$IFDEF VCL} procedure TJvExMaskEdit.Dispatch(var Msg); asm --- 471,474 ---- *************** *** 910,1034 **** {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExMaskEdit.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExMaskEdit.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExMaskEdit.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExMaskEdit.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExMaskEdit.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExMaskEdit.IsRightToLeft: Boolean; - begin - Result := False; - end; - - function TJvExMaskEdit.NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; - begin - Result := WidgetControl_NeedKey(Self, Key, Shift, KeyText, - inherited NeedKey(Key, Shift, KeyText)); - end; - - procedure TJvExMaskEdit.OnFontChanged(Sender: TObject); - var - FontChangedEvent: QEventH; - begin - FontChangedEvent := QEvent_create(QEventType_FontChanged); - if FontChangedEvent <> nil then - QApplication_postEvent(Handle, FontChangedEvent); - end; - - procedure TJvExMaskEdit.DoFontChanged(Sender: TObject); - begin - if Assigned(InternalFontChanged) then - InternalFontChanged(self); - end; - - procedure TJvExMaskEdit.BoundsChanged; - begin - inherited BoundsChanged; - DoBoundsChanged; - end; - - procedure TJvExMaskEdit.RecreateWnd; - begin - RecreateWidget; - end; - - procedure TJvExMaskEdit.CreateWidget; - begin - CreateWnd; - end; - - procedure TJvExMaskEdit.CreateWnd; - begin - inherited CreateWidget; - end; - - function TJvExMaskEdit.WidgetFlags: integer; - begin - Result := inherited WidgetFlags or - integer(WidgetFlags_WRepaintNoErase) or - integer(WidgetFlags_WMouseNoMask); - end; - - function TJvExMaskEdit.EventFilter(Sender: QObjectH; Event: QEventH): boolean; - begin - Result := inherited EventFilter(Sender, Event); - Result := Result or WidgetControl_EventFilter(Self, Sender, Event); - end; - - procedure TJvExMaskEdit.PaintWindow(PaintDevice: QPaintDeviceH); - begin - WidgetControl_PaintTo(self, PaintDevice, 0, 0); - end; - - procedure TJvExMaskEdit.PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - begin - WidgetControl_PaintTo(self, PaintDevice, X, Y); - end; - - {$ENDIF VisualCLX} procedure TJvExMaskEdit.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 600,603 ---- *************** *** 1064,1091 **** constructor TJvExMaskEdit.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); - {$IFDEF VisualCLX} - FCanvas := TControlCanvas.Create; - TControlCanvas(FCanvas).Control := Self; - InternalFontChanged := Font.OnChange; - Font.OnChange := OnFontChanged; - {$ENDIF VisualCLX} FHintColor := Application.HintColor; end; - {$IFDEF VisualCLX} - procedure TJvExMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExMaskEdit.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} destructor TJvExMaskEdit.Destroy; --- 633,640 ---- *************** *** 1098,1107 **** // (ahuser) there is no caClear so we restrict it to caCut if caCut in ClipboardCommands then - {$IFDEF VCL} InheritMsg(Self, WM_CLEAR); - {$ENDIF VCL} - {$IFDEF VisualCLX} - inherited Clear; - {$ENDIF VisualCLX} end; --- 647,651 ---- *************** *** 1135,1170 **** end; - {$IFDEF VisualCLX} - - procedure TJvExMaskEdit.Clear; - begin - DoClearText; - end; - - procedure TJvExMaskEdit.EMGetRect(var Msg: TMessage); - begin - if Msg.LParam <> 0 then - begin - if IsRectEmpty(FEditRect) then - begin - PRect(Msg.LParam)^ := ClientRect; - if Self.BorderStyle = bsSingle then - InflateRect(PRect(Msg.LParam)^, -2, -2); - end - else - PRect(Msg.LParam)^ := FEditRect; - end; - end; - - procedure TJvExMaskEdit.EMSetRect(var Msg: TMessage); - begin - if Msg.LParam <> 0 then - FEditRect := PRect(Msg.LParam)^ - else - FEditRect := ClientRect; - Invalidate; - end; - - {$ENDIF VisualCLX} procedure TJvExMaskEdit.DoBeepOnError; --- 679,682 ---- *************** *** 1180,1183 **** ! {$UNDEF CONSTRUCTOR_CODE} // undefine at file end end. --- 692,695 ---- ! // undefine at file end end. Index: JvExExtCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExExtCtrls.pas,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** JvExExtCtrls.pas 4 Sep 2004 06:06:23 -0000 1.43 --- JvExExtCtrls.pas 9 Sep 2004 17:24:01 -0000 1.44 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,64 **** [...4866 lines suppressed...] - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExColorBox.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} destructor TJvExColorBox.Destroy; --- 4384,4391 ---- *************** *** 7803,7807 **** {$ENDIF COMPILER6_UP} - {$ENDIF VCL} // SplitterMouseDownFix fixes a bug in the VCL that causes the splitter to no --- 4395,4398 ---- Index: JvExGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExGrids.pas,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** JvExGrids.pas 4 Sep 2004 06:06:23 -0000 1.40 --- JvExGrids.pas 9 Sep 2004 17:24:01 -0000 1.41 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,75 **** [...1808 lines suppressed...] - FDoubleBuffered := Value; - end; - end; - - procedure TJvExStringGrid.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - CustomControl_Painting(Self, Canvas, EventRegion); - end; - - - {$ENDIF VisualCLX} - {$IFNDEF HAS_GRID_EDITSTYLE} - function TJvExStringGrid.GetEditStyle(ACol, ARow: Longint): TEditStyle; - begin - Result := esSimple; - end; - {$ENDIF !HAS_GRID_EDITSTYLE} --- 1582,1585 ---- Index: JvExButtons.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExButtons.pas,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** JvExButtons.pas 4 Sep 2004 06:06:22 -0000 1.41 --- JvExButtons.pas 9 Sep 2004 17:24:00 -0000 1.42 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,64 **** uses - {$IFDEF VCL} Windows, Messages, - {$ENDIF VCL} Graphics, Controls, Forms, Buttons, StdCtrls, - {$IFDEF VisualCLX} - Qt, QWindows, - {$ENDIF VisualCLX} Classes, SysUtils, JvTypes, JvThemes, JVCLVer, JvExControls; - {$IFDEF VCL} - {$DEFINE NeedMouseEnterLeave} - {$ENDIF VCL} - {$IFDEF VisualCLX} - {$IF not declared(PatchedVCLX)} - {$DEFINE NeedMouseEnterLeave} - {$IFEND} - {$ENDIF VisualCLX} type TJvExSpeedButton = class(TSpeedButton, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 43,54 ---- *************** *** 84,100 **** public procedure Dispatch(var Msg); override; - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - {$ENDIF VisualCLX} private FHintColor: TColor; --- 74,77 ---- *************** *** 102,106 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 79,82 ---- *************** *** 108,112 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 84,87 ---- *************** *** 116,129 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} public --- 91,97 ---- *************** *** 133,137 **** TJvExPubSpeedButton = class(TJvExSpeedButton) - {$IFDEF VCL} published property BiDiMode; --- 101,104 ---- *************** *** 142,150 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; TJvExBitBtn = class(TBitBtn, IJvWinControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 109,115 ---- *************** *** 184,217 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 149,152 ---- *************** *** 219,223 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 154,157 ---- *************** *** 225,229 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 159,162 ---- *************** *** 233,246 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 166,172 ---- *************** *** 249,259 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FCanvas: TCanvas; - protected - procedure Paint; virtual; - property Canvas: TCanvas read FCanvas; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 175,178 ---- *************** *** 262,266 **** TJvExPubBitBtn = class(TJvExBitBtn) - {$IFDEF VCL} published property BiDiMode; --- 181,184 ---- *************** *** 271,275 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; --- 189,192 ---- *************** *** 277,281 **** implementation - {$IFDEF VCL} procedure TJvExSpeedButton.Dispatch(var Msg); asm --- 194,197 ---- *************** *** 367,425 **** {$ENDIF !COMPILER6_UP} {$ENDIF !HASAUTOSIZE} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExSpeedButton.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExSpeedButton.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExSpeedButton.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExSpeedButton.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExSpeedButton.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExSpeedButton.IsRightToLeft: Boolean; - begin - Result := False; - end; - - {$ENDIF VisualCLX} procedure TJvExSpeedButton.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 283,286 ---- *************** *** 434,440 **** constructor TJvExSpeedButton.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); FHintColor := Application.HintColor; --- 295,298 ---- *************** *** 448,452 **** end; - {$IFDEF VCL} procedure TJvExBitBtn.Dispatch(var Msg); asm --- 306,309 ---- *************** *** 578,702 **** {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExBitBtn.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExBitBtn.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExBitBtn.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExBitBtn.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExBitBtn.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExBitBtn.IsRightToLeft: Boolean; - begin - Result := False; - end; - - function TJvExBitBtn.NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; - begin - Result := WidgetControl_NeedKey(Self, Key, Shift, KeyText, - inherited NeedKey(Key, Shift, KeyText)); - end; - - procedure TJvExBitBtn.OnFontChanged(Sender: TObject); - var - FontChangedEvent: QEventH; - begin - FontChangedEvent := QEvent_create(QEventType_FontChanged); - if FontChangedEvent <> nil then - QApplication_postEvent(Handle, FontChangedEvent); - end; - - procedure TJvExBitBtn.DoFontChanged(Sender: TObject); - begin - if Assigned(InternalFontChanged) then - InternalFontChanged(self); - end; - - procedure TJvExBitBtn.BoundsChanged; - begin - inherited BoundsChanged; - DoBoundsChanged; - end; - - procedure TJvExBitBtn.RecreateWnd; - begin - RecreateWidget; - end; - - procedure TJvExBitBtn.CreateWidget; - begin - CreateWnd; - end; - - procedure TJvExBitBtn.CreateWnd; - begin - inherited CreateWidget; - end; - - function TJvExBitBtn.WidgetFlags: integer; - begin - Result := inherited WidgetFlags or - integer(WidgetFlags_WRepaintNoErase) or - integer(WidgetFlags_WMouseNoMask); - end; - - function TJvExBitBtn.EventFilter(Sender: QObjectH; Event: QEventH): boolean; - begin - Result := inherited EventFilter(Sender, Event); - Result := Result or WidgetControl_EventFilter(Self, Sender, Event); - end; - - procedure TJvExBitBtn.PaintWindow(PaintDevice: QPaintDeviceH); - begin - WidgetControl_PaintTo(self, PaintDevice, 0, 0); - end; - - procedure TJvExBitBtn.PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - begin - WidgetControl_PaintTo(self, PaintDevice, X, Y); - end; - - {$ENDIF VisualCLX} procedure TJvExBitBtn.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 435,438 ---- *************** *** 732,759 **** constructor TJvExBitBtn.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); - {$IFDEF VisualCLX} - FCanvas := TControlCanvas.Create; - TControlCanvas(FCanvas).Control := Self; - InternalFontChanged := Font.OnChange; - Font.OnChange := OnFontChanged; - {$ENDIF VisualCLX} FHintColor := Application.HintColor; end; - {$IFDEF VisualCLX} - procedure TJvExBitBtn.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExBitBtn.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} destructor TJvExBitBtn.Destroy; --- 468,475 ---- Index: JvExComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExComCtrls.pas,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** JvExComCtrls.pas 4 Sep 2004 06:06:22 -0000 1.44 --- JvExComCtrls.pas 9 Sep 2004 17:24:00 -0000 1.45 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,72 **** [...15788 lines suppressed...] - procedure TJvExCustomSpinEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); - begin - WidgetControl_Painting(Self, Canvas, EventRegion); - end; - - procedure TJvExCustomSpinEdit.Paint; - begin - WidgetControl_DefaultPaint(self, Canvas); - end; - {$ENDIF VisualCLX} - - destructor TJvExCustomSpinEdit.Destroy; - begin - inherited Destroy; - end; - - {$ENDIF VisualCLX} --- 7054,7058 ---- Index: JvExControls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExControls.pas,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** JvExControls.pas 4 Sep 2004 06:06:23 -0000 1.70 --- JvExControls.pas 9 Sep 2004 17:24:01 -0000 1.71 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 44,65 **** Libc, [...2709 lines suppressed...] *************** *** 4011,4027 **** {$ENDIF COMPILER5} - {$IFDEF VisualCLX} - UninstallProcHook(@CallCutToClipboard); - UninstallProcHook(@CallCopyToClipboard); - UninstallProcHook(@CallPasteFromClipboard); - {$IFDEF COMPILER7} - UninstallProcHook(@CallUndo); - {$ELSE} - {$IF declared(PatchedVCLX)} - UninstallProcHook(@CallUndo); - {$IFEND} - {$ENDIF COMPILER7} - //UninstallProcHook(@CallSetFocusedControl); - {$ENDIF VisualCLX} end. --- 1932,1935 ---- Index: JvExDBGrids.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExDBGrids.pas,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** JvExDBGrids.pas 4 Sep 2004 06:06:23 -0000 1.27 --- JvExDBGrids.pas 9 Sep 2004 17:24:01 -0000 1.28 *************** *** 1,2 **** --- 1,6 ---- + {**************************************************************************************************} + { WARNING: JEDI preprocessor generated unit. Do not edit. } + {**************************************************************************************************} + {----------------------------------------------------------------------------- The contents of this file are subject to the Mozilla Public License *************** *** 39,63 **** uses - {$IFDEF VCL} Windows, Messages, Graphics, Controls, Forms, DBGrids, - {$ENDIF VCl} - {$IFDEF VisualCLX} - Types, Qt, QGraphics, QControls, QForms, QDBGrids, QWindows, - {$ENDIF VisualCLX} Classes, SysUtils, JvTypes, JvThemes, JVCLVer, JvExControls; - {$IFDEF VCL} - {$DEFINE NeedMouseEnterLeave} - {$ENDIF VCL} - {$IFDEF VisualCLX} - {$IF not declared(PatchedVCLX)} - {$DEFINE NeedMouseEnterLeave} - {$IFEND} - {$ENDIF VisualCLX} type TJvExCustomDBGrid = class(TCustomDBGrid, IJvWinControlEvents, IJvCustomControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 43,53 ---- *************** *** 97,130 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 87,90 ---- *************** *** 132,136 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 92,95 ---- *************** *** 138,142 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 97,100 ---- *************** *** 146,159 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 104,110 ---- *************** *** 162,175 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FDoubleBuffered: Boolean; - function GetDoubleBuffered: Boolean; - procedure SetDoubleBuffered(Value: Boolean); - protected - procedure ColorChanged; override; - published // asn: change to public in final - property DoubleBuffered: Boolean read GetDoubleBuffered write SetDoubleBuffered; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 113,116 ---- *************** *** 178,182 **** TJvExPubCustomDBGrid = class(TJvExCustomDBGrid) - {$IFDEF VCL} published property BiDiMode; --- 119,122 ---- *************** *** 187,195 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; TJvExDBGrid = class(TDBGrid, IJvWinControlEvents, IJvCustomControlEvents, IJvControlEvents, IPerformControl) - {$IFDEF VCL} protected // IJvControlEvents --- 127,133 ---- *************** *** 229,262 **** property ParentBackground: Boolean read GetParentBackground write SetParentBackground; {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - // IJvControlEvents - public - function Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - function IsRightToLeft: Boolean; - protected - WindowProc: TClxWindowProc; - procedure WndProc(var Msg: TMessage); virtual; - procedure MouseEnter(Control: TControl); override; - procedure MouseLeave(Control: TControl); override; - procedure ParentColorChanged; override; - private - InternalFontChanged: TNotifyEvent; - procedure OnFontChanged(Sender: TObject); - protected - procedure BoundsChanged; override; - procedure DoFontChanged(Sender: TObject); dynamic; - function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; override; - function NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; override; - procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override; - procedure PaintWindow(PaintDevice: QPaintDeviceH); - function WidgetFlags: integer; override; - procedure CreateWnd; dynamic; - procedure CreateWidget; override; - procedure RecreateWnd; - public - procedure PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - {$ENDIF VisualCLX} private FHintColor: TColor; --- 167,170 ---- *************** *** 264,268 **** FMouseOver: Boolean; FOnParentColorChanged: TNotifyEvent; - {$IFDEF NeedMouseEnterLeave} FOnMouseEnter: TNotifyEvent; FOnMouseLeave: TNotifyEvent; --- 172,175 ---- *************** *** 270,274 **** property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; - {$ENDIF NeedMouseEnterLeave} protected procedure CMFocusChanged(var Msg: TCMFocusChanged); message CM_FOCUSCHANGED; --- 177,180 ---- *************** *** 278,291 **** property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; private - {$IFDEF VCL} FAboutJVCL: TJVCLAboutInfo; published property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False; - {$ENDIF VCL} - {$IFDEF VisualCLX} - FAboutJVCLX: TJVCLAboutInfo; - published - property AboutJVCLX: TJVCLAboutInfo read FAboutJVCLX write FAboutJVCLX stored False; - {$ENDIF VisualCLX} protected procedure DoGetDlgCode(var Code: TDlgCodes); virtual; --- 184,190 ---- *************** *** 294,307 **** procedure DoBoundsChanged; dynamic; function DoPaintBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual; - {$IFDEF VisualCLX} - private - FDoubleBuffered: Boolean; - function GetDoubleBuffered: Boolean; - procedure SetDoubleBuffered(Value: Boolean); - protected - procedure ColorChanged; override; - published // asn: change to public in final - property DoubleBuffered: Boolean read GetDoubleBuffered write SetDoubleBuffered; - {$ENDIF VisualCLX} public constructor Create(AOwner: TComponent); override; --- 193,196 ---- *************** *** 310,314 **** TJvExPubDBGrid = class(TJvExDBGrid) - {$IFDEF VCL} published property BiDiMode; --- 199,202 ---- *************** *** 319,323 **** property OnEndDock; property OnStartDock; - {$ENDIF VCL} end; --- 207,210 ---- *************** *** 325,329 **** implementation - {$IFDEF VCL} procedure TJvExCustomDBGrid.Dispatch(var Msg); asm --- 212,215 ---- *************** *** 455,579 **** {$ENDIF JVCLThemesEnabledD56} - {$ENDIF VCL} - {$IFDEF VisualCLX} - procedure TJvExCustomDBGrid.MouseEnter(Control: TControl); - begin - Control_MouseEnter(Self, Control, FMouseOver, FSavedHintColor, FHintColor); - inherited MouseEnter(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseEnter) then - FOnMouseEnter(Self); - {$IFEND} - end; - - procedure TJvExCustomDBGrid.MouseLeave(Control: TControl); - begin - Control_MouseLeave(Self, Control, FMouseOver, FSavedHintColor); - inherited MouseLeave(Control); - {$IF not declared(PatchedVCLX)} - if Assigned(FOnMouseLeave) then - FOnMouseLeave(Self); - {$IFEND} - end; - - procedure TJvExCustomDBGrid.ParentColorChanged; - begin - inherited ParentColorChanged; - if Assigned(FOnParentColorChanged) then - FOnParentColorChanged(Self); - end; - - function TJvExCustomDBGrid.Perform(Msg: Cardinal; WParam, LParam: Longint): Longint; - var - Mesg: TMessage; - begin - Mesg.Result := 0; - if Self <> nil then - begin - Mesg.Msg := Msg; - Mesg.WParam := WParam; - Mesg.LParam := LParam; - WindowProc(Mesg); - end; - Result := Mesg.Result; - end; - - procedure TJvExCustomDBGrid.WndProc(var Msg: TMessage); - begin - Dispatch(Msg); - end; - - function TJvExCustomDBGrid.IsRightToLeft: Boolean; - begin - Result := False; - end; - - function TJvExCustomDBGrid.NeedKey(Key: Integer; Shift: TShiftState; - const KeyText: WideString): Boolean; - begin - Result := WidgetControl_NeedKey(Self, Key, Shift, KeyText, - inherited NeedKey(Key, Shift, KeyText)); - end; - - procedure TJvExCustomDBGrid.OnFontChanged(Sender: TObject); - var - FontChangedEvent: QEventH; - begin - FontChangedEvent := QEvent_create(QEventType_FontChanged); - if FontChangedEvent <> nil then - QApplication_postEvent(Handle, FontChangedEvent); - end; - - procedure TJvExCustomDBGrid.DoFontChanged(Sender: TObject); - begin - if Assigned(InternalFontChanged) then - InternalFontChanged(self); - end; - - procedure TJvExCustomDBGrid.BoundsChanged; - begin - inherited BoundsChanged; - DoBoundsChanged; - end; - - procedure TJvExCustomDBGrid.RecreateWnd; - begin - RecreateWidget; - end; - - procedure TJvExCustomDBGrid.CreateWidget; - begin - CreateWnd; - end; - - procedure TJvExCustomDBGrid.CreateWnd; - begin - inherited CreateWidget; - end; - - function TJvExCustomDBGrid.WidgetFlags: integer; - begin - Result := inherited WidgetFlags or - integer(WidgetFlags_WRepaintNoErase) or - integer(WidgetFlags_WMouseNoMask); - end; - - function TJvExCustomDBGrid.EventFilter(Sender: QObjectH; Event: QEventH): boolean; - begin - Result := inherited EventFilter(Sender, Event); - Result := Result or WidgetControl_EventFilter(Self, Sender, Event); - end; - - procedure TJvExCustomDBGrid.PaintWindow(PaintDevice: QPaintDeviceH); - begin - WidgetControl_PaintTo(self, PaintDevice, 0, 0); - end; - - procedure TJvExCustomDBGrid.PaintTo(PaintDevice: QPaintDeviceH; X, Y: integer); - begin - WidgetControl_PaintTo(self, PaintDevice, X, Y); - end; - - {$ENDIF VisualCLX} procedure TJvExCustomDBGrid.CMFocusChanged(var Msg: TCMFocusChanged); begin --- 341,344 ---- *************** *** 607,616 **** end; - {$IFDEF VCL} constructor TJvExCustomDBGrid.Create(AOwner: TComponent); begin - {$IFDEF VisualCLX} - WindowProc := WndProc; - {$ENDIF VisualCLX} inherited Create(AOwner); FHintColor := Application.HintColor; --- 372,377 ---- *************** *** 624,676 **** end; - {$ENDIF VCL} - {$IFDEF VisualCLX} - constructor TJvExCustomDBGrid... [truncated message content] |