Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/devtools/JvExVCL/src JvExButtons.pas,1.1,1.2 JvExControls.macros,1.1,1.2 JvExControls.pas,1.1,1.2 JvExDBCtrls.pas,1.1,1.2 - Style cleaned files
|
From: Andreas H. <ah...@us...> - 2004-01-09 22:13:45
|
Update of /cvsroot/jvcl/dev/JVCL3/devtools/JvExVCL/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1573/devtools/JvExVCL/src
Modified Files:
JvExButtons.pas JvExControls.macros JvExControls.pas
JvExDBCtrls.pas
Log Message:
Style cleaned files
Index: JvExButtons.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExVCL/src/JvExButtons.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvExButtons.pas 6 Jan 2004 22:40:36 -0000 1.1
--- JvExButtons.pas 9 Jan 2004 22:13:41 -0000 1.2
***************
*** 46,50 ****
JV_CONTROL_EVENTS_BEGIN1(SpeedButton, IJvSpeedButtonEvents)
protected
! // TJvExSpeedButton
procedure ButtonPressed(Sender: TSpeedButton; GroupIndex: Integer); dynamic;
JV_CONTROL_EVENTS_END
--- 46,50 ----
JV_CONTROL_EVENTS_BEGIN1(SpeedButton, IJvSpeedButtonEvents)
protected
! // IJvSpeedButtonEvents
procedure ButtonPressed(Sender: TSpeedButton; GroupIndex: Integer); dynamic;
JV_CONTROL_EVENTS_END
***************
*** 62,74 ****
end;
! procedure TJvExSpeedButton.Dispatch(var Message);
begin
! if not DispatchMsg(Self, Message) then
! case TMessage(Message).Msg of
CM_BUTTONPRESSED:
! with TMessage(Message) do
ButtonPressed(TSpeedButton(LParam), WParam);
else
! inherited Dispatch(Message);
end;
end;
--- 62,74 ----
end;
! procedure TJvExSpeedButton.Dispatch(var Msg);
begin
! if not DispatchMsg(Self, Msg) then
! case TMessage(Msg).Msg of
CM_BUTTONPRESSED:
! with TMessage(Msg) do
ButtonPressed(TSpeedButton(LParam), WParam);
else
! inherited Dispatch(Msg);
end;
end;
Index: JvExControls.macros
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExVCL/src/JvExControls.macros,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvExControls.macros 6 Jan 2004 22:40:36 -0000 1.1
--- JvExControls.macros 9 Jan 2004 22:13:41 -0000 1.2
***************
*** 60,65 ****
(*$DEFINE JV_CONTROL_EVENTS_BEGIN(ClassName)
- //
- // --------------------------------------
JV_CONTROL_EVENTS_CLASS(ClassName)
{$IFDEF VCL}
--- 60,63 ----
***************
*** 68,73 ****
(*$DEFINE JV_CONTROL_EVENTS_BEGIN1(ClassName, Intf1)
- //
- // --------------------------------------
JV_CONTROL_EVENTS_CLASS1(ClassName, Intf1)
{$IFDEF VCL}
--- 66,69 ----
***************
*** 76,81 ****
(*$DEFINE JV_CONTROL_EVENTS_BEGIN2(ClassName, Intf2, Intf1)
- //
- // --------------------------------------
JV_CONTROL_EVENTS_CLASS2(ClassName, Intf2, Intf1)
{$IFDEF VCL}
--- 72,75 ----
***************
*** 84,89 ****
(*$DEFINE JV_CONTROL_EVENTS_BEGIN3(ClassName, Intf3, Intf2, Intf1)
- //
- // --------------------------------------
JV_CONTROL_EVENTS_CLASS3(ClassName, Intf3, Intf2, Intf1)
{$IFDEF VCL}
--- 78,81 ----
***************
*** 108,114 ****
(*$DEFINE JV_CONTROL_EVENTS_END
public
! procedure Dispatch(var Message); override;
private
! FOnMouseEnter, FOnMouseLeave: TNotifyEvent;
protected
property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
--- 100,107 ----
(*$DEFINE JV_CONTROL_EVENTS_END
public
! procedure Dispatch(var Msg); override;
private
! FOnMouseEnter: TNotifyEvent;
! FOnMouseLeave: TNotifyEvent;
protected
property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
***************
*** 118,122 ****
{$IF not declared(PatchedVCLX)}
private
! FOnMouseEnter, FOnMouseLeave: TNotifyEvent;
protected
procedure MouseEnter(Control: TControl); override;
--- 111,116 ----
{$IF not declared(PatchedVCLX)}
private
! FOnMouseEnter: TNotifyEvent;
! FOnMouseLeave: TNotifyEvent;
protected
procedure MouseEnter(Control: TControl); override;
***************
*** 125,129 ****
property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
{$IFEND}
! {$ENDIF}
end;
*)
--- 119,123 ----
property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
{$IFEND}
! {$ENDIF VisualCLX}
end;
*)
***************
*** 140,146 ****
(*$DEFINE JV_CONTROL_EVENTS_IMPLX(ClassName)
! //
! // -----------------------------------------------------------------------------
{$IFDEF VCL}
procedure TJvEx##ClassName.VisibleChanged;
begin
--- 134,140 ----
(*$DEFINE JV_CONTROL_EVENTS_IMPLX(ClassName)
!
{$IFDEF VCL}
+
procedure TJvEx##ClassName.VisibleChanged;
begin
***************
*** 235,249 ****
JV_CONTROL_EVENTS_IMPLX(ClassName)
{$IFDEF VCL}
! procedure TJvEx##ClassName.Dispatch(var Message);
begin
! if not DispatchMsg(Self, Message) then
! inherited Dispatch(Message);
end;
{$ENDIF VCL}
*)
! (*$DEFINE JV_WINCONTROL_EVENTS_IMPLX(ClassName)
JV_CONTROL_EVENTS_IMPLX(ClassName)
{$IFDEF VCL}
procedure TJvEx##ClassName.CursorChanged;
begin
--- 229,244 ----
JV_CONTROL_EVENTS_IMPLX(ClassName)
{$IFDEF VCL}
! procedure TJvEx##ClassName.Dispatch(var Msg);
begin
! if not DispatchMsg(Self, Msg) then
! inherited Dispatch(Msg);
end;
{$ENDIF VCL}
*)
! (*$DEFINE JV_WINCONTROL_EVENTS_IMPLX_OPEN_VCL(ClassName)
JV_CONTROL_EVENTS_IMPLX(ClassName)
{$IFDEF VCL}
+
procedure TJvEx##ClassName.CursorChanged;
begin
***************
*** 276,290 ****
InheritMsg(Self, CM_CONTROLCHANGE, Integer(Control), Integer(Inserting))
end;
! {$ENDIF VCL}
*)
(*$DEFINE JV_WINCONTROL_EVENTS_IMPL(ClassName)
! JV_WINCONTROL_EVENTS_IMPLX(ClassName)
! {$IFDEF VCL}
! procedure TJvEx##ClassName.Dispatch(var Message);
begin
! if not DispatchMsg(Self, Message) then
! inherited Dispatch(Message);
end;
{$ENDIF VCL}
*)
--- 271,289 ----
InheritMsg(Self, CM_CONTROLCHANGE, Integer(Control), Integer(Inserting))
end;
! *)
!
! (*$DEFINE JV_WINCONTROL_EVENTS_IMPLX(ClassName)
! JV_WINCONTROL_EVENTS_IMPLX_OPEN_VCL
! {$ENDIF VCL}
*)
(*$DEFINE JV_WINCONTROL_EVENTS_IMPL(ClassName)
! JV_WINCONTROL_EVENTS_IMPLX_OPEN_VCL(ClassName)
! procedure TJvEx##ClassName.Dispatch(var Msg);
begin
! if not DispatchMsg(Self, Msg) then
! inherited Dispatch(Msg);
end;
+
{$ENDIF VCL}
*)
Index: JvExControls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExVCL/src/JvExControls.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvExControls.pas 6 Jan 2004 22:40:36 -0000 1.1
--- JvExControls.pas 9 Jan 2004 22:13:41 -0000 1.2
***************
*** 77,83 ****
function ShiftStateToKeyData(Shift: TShiftState): Longint;
! function InheritMsg(Self: TControl; Msg: Integer; WParam, LParam: Integer): Integer; overload;
! function InheritMsg(Self: TControl; Msg: Integer): Integer; overload;
! function DispatchMsg(Self: TControl; var Message): Boolean;
{$ENDIF VCL}
--- 77,83 ----
function ShiftStateToKeyData(Shift: TShiftState): Longint;
! function InheritMsg(ASelf: TControl; Msg: Integer; WParam, LParam: Integer): Integer; overload;
! function InheritMsg(ASelf: TControl; Msg: Integer): Integer; overload;
! function DispatchMsg(ASelf: TControl; var Msg): Boolean;
{$ENDIF VCL}
***************
*** 96,154 ****
end;
! function InheritMsg(Self: TControl; Msg: Integer; WParam, LParam: Integer): Integer;
type
! TMessageHandler = procedure(Self: TObject; var Message: TMessage);
var
Proc: TMessageHandler;
! Message: TMessage;
begin
! Message.Msg := Msg;
! Message.WParam := WParam;
! Message.LParam := LParam;
! Message.Result := 0;
Proc := @TObject.Dispatch;
! Proc(Self, Message);
! Result := Message.Result;
end;
! function InheritMsg(Self: TControl; Msg: Integer): Integer;
begin
! Result := InheritMsg(Self, Msg, 0, 0);
end;
! function DispatchMsg(Self: TControl; var Message): Boolean;
var
IntfControl: IJvControlEvents;
IntfWinControl: IJvWinControlEvents;
! Msg: PMessage;
begin
! Msg := @Message;
! { GetInterface is no problem because Self is a TComponent derived class that
is not released by an interface "Release". }
! if Self.GetInterface(IJvControlEvents, IntfControl) then
begin
Result := True;
with IntfControl do
! case Msg^.Msg of
! CM_VISIBLECHANGED: VisibleChanged;
! CM_ENABLEDCHANGED: EnabledChanged;
! CM_FONTCHANGED: FontChanged;
! CM_COLORCHANGED: ColorChanged;
! CM_PARENTFONTCHANGED: ParentFontChanged;
! CM_PARENTCOLORCHANGED: ParentColorChanged;
! CM_PARENTSHOWHINTCHANGED: ParentShowHintChanged;
! CM_TEXTCHANGED: TextChanged;
!
CM_HINTSHOW:
! Msg^.Result := Integer(HintShow(TCMHintShow(Msg^).HintInfo^));
CM_HITTEST:
! with TCMHitTest(Msg^) do
Result := Integer(HitTest(XPos, YPos));
CM_MOUSEENTER:
! MouseEnter(TControl(Msg^.LParam));
CM_MOUSELEAVE:
! MouseLeave(TControl(Msg^.LParam));
CM_DIALOGCHAR:
! with TCMDialogChar(Msg^) do
Result := Ord(WantKey(CharCode, KeyDataToShiftState(KeyData), WideChar(CharCode)));
else
--- 96,161 ----
end;
! function InheritMsg(ASelf: TControl; Msg: Integer; WParam, LParam: Integer): Integer;
type
! TMessageHandler = procedure(Self: TObject; var Msg: TMessage);
var
Proc: TMessageHandler;
! Mesg: TMessage;
begin
! Mesg.Msg := Msg;
! Mesg.WParam := WParam;
! Mesg.LParam := LParam;
! Mesg.Result := 0;
Proc := @TObject.Dispatch;
! Proc(ASelf, Mesg);
! Result := Mesg.Result;
end;
! function InheritMsg(ASelf: TControl; Msg: Integer): Integer;
begin
! Result := InheritMsg(ASelf, Msg, 0, 0);
end;
! function DispatchMsg(ASelf: TControl; var Msg): Boolean;
var
IntfControl: IJvControlEvents;
IntfWinControl: IJvWinControlEvents;
! PMsg: PMessage;
begin
! PMsg := @Msg;
! { GetInterface is no problem because ASelf is a TComponent derived class that
is not released by an interface "Release". }
! if ASelf.GetInterface(IJvControlEvents, IntfControl) then
begin
Result := True;
with IntfControl do
! case PMsg^.Msg of
! CM_VISIBLECHANGED:
! VisibleChanged;
! CM_ENABLEDCHANGED:
! EnabledChanged;
! CM_FONTCHANGED:
! FontChanged;
! CM_COLORCHANGED:
! ColorChanged;
! CM_PARENTFONTCHANGED:
! ParentFontChanged;
! CM_PARENTCOLORCHANGED:
! ParentColorChanged;
! CM_PARENTSHOWHINTCHANGED:
! ParentShowHintChanged;
! CM_TEXTCHANGED:
! TextChanged;
CM_HINTSHOW:
! PMsg^.Result := Integer(HintShow(TCMHintShow(PMsg^).HintInfo^));
CM_HITTEST:
! with TCMHitTest(PMsg^) do
Result := Integer(HitTest(XPos, YPos));
CM_MOUSEENTER:
! MouseEnter(TControl(PMsg^.LParam));
CM_MOUSELEAVE:
! MouseLeave(TControl(PMsg^.LParam));
CM_DIALOGCHAR:
! with TCMDialogChar(PMsg^) do
Result := Ord(WantKey(CharCode, KeyDataToShiftState(KeyData), WideChar(CharCode)));
else
***************
*** 161,182 ****
if not Result then
begin
! if Self.GetInterface(IJvWinControlEvents, IntfWinControl) then
begin
Result := True;
with IntfWinControl do
! case Msg^.Msg of
! CM_CURSORCHANGED: CursorChanged;
! CM_SHOWINGCHANGED: ShowingChanged;
! CM_SHOWHINTCHANGED: ShowHintChanged;
CM_CONTROLLISTCHANGE:
! if BOOL(Msg^.LParam) then
! ControlsListChanging(TControl(Msg.WParam), BOOL(Msg^.LParam))
else
! ControlsListChanged(TControl(Msg.WParam), BOOL(Msg^.LParam));
CM_CONTROLCHANGE:
! if not BOOL(Msg^.LParam) then
! ControlsListChanging(TControl(Msg.WParam), BOOL(Msg^.LParam))
else
! ControlsListChanged(TControl(Msg.WParam), BOOL(Msg^.LParam));
else
Result := False;
--- 168,192 ----
if not Result then
begin
! if ASelf.GetInterface(IJvWinControlEvents, IntfWinControl) then
begin
Result := True;
with IntfWinControl do
! case PMsg^.Msg of
! CM_CURSORCHANGED:
! CursorChanged;
! CM_SHOWINGCHANGED:
! ShowingChanged;
! CM_SHOWHINTCHANGED:
! ShowHintChanged;
CM_CONTROLLISTCHANGE:
! if PMsg^.LParam <> 0 then
! ControlsListChanging(TControl(PMsg^.WParam), True)
else
! ControlsListChanged(TControl(PMsg^.WParam), False);
CM_CONTROLCHANGE:
! if PMsg^.LParam = 0 then
! ControlsListChanging(TControl(PMsg^.WParam), False)
else
! ControlsListChanged(TControl(PMsg^.WParam), True);
else
Result := False;
Index: JvExDBCtrls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExVCL/src/JvExDBCtrls.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JvExDBCtrls.pas 6 Jan 2004 22:40:36 -0000 1.1
--- JvExDBCtrls.pas 9 Jan 2004 22:13:41 -0000 1.2
***************
*** 88,100 ****
end;
! procedure TJvExNavButton.Dispatch(var Message);
begin
! if not DispatchMsg(Self, Message) then
! case TMessage(Message).Msg of
CM_BUTTONPRESSED:
! with TMessage(Message) do
ButtonPressed(TSpeedButton(LParam), WParam);
else
! inherited Dispatch(Message);
end;
end;
--- 88,100 ----
end;
! procedure TJvExNavButton.Dispatch(var Msg);
begin
! if not DispatchMsg(Self, Msg) then
! case TMessage(Msg).Msg of
CM_BUTTONPRESSED:
! with TMessage(Msg) do
ButtonPressed(TSpeedButton(LParam), WParam);
else
! inherited Dispatch(Msg);
end;
end;
|