[JVCL-Checkins] dev/JVCL3/devtools/JvExCLX/src JvExControls.macros,1.6,1.7 JvExControls.pas,1.4,1.5 JvQExControls.macros,1.7,1.8 JvQExControls.pas,1.6,1.7 - updated

[André S. <asn...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/devtools/JvExCLX/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25491/JVCL3/devtools/JvExCLX/src

Modified Files:
	JvExControls.macros JvExControls.pas JvQExControls.macros 
	JvQExControls.pas 
Log Message:
updated


Index: JvQExControls.macros
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExCLX/src/JvQExControls.macros,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvQExControls.macros	28 Oct 2004 22:54:26 -0000	1.7
--- JvQExControls.macros	29 Oct 2004 12:14:17 -0000	1.8
***************
*** 136,141 ****
      procedure DoKillFocus(NextWnd: HWND); dynamic;
      procedure DoSetFocus(PreviousWnd: HWND); dynamic;
!     procedure GotFocus; dynamic;
!     procedure LostFocus; dynamic;
      function DoEraseBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual;
      procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override;
--- 136,141 ----
      procedure DoKillFocus(NextWnd: HWND); dynamic;
      procedure DoSetFocus(PreviousWnd: HWND); dynamic;
!     procedure DoEnter; override;
!     procedure DoExit; override;
      function DoEraseBackground(Canvas: TCanvas; Param: Integer): Boolean; virtual;
      procedure Painting(Sender: QObjectH; EventRegion: QRegionH); override;
***************
*** 515,520 ****
  (*$DEFINE JV_IMPL_WINCONTROL_MESSAGES
        { WinControl Messages }
-       CM_GOTFOCUS         : GotFocus;
-       CM_LOSTFOCUS        : LostFocus;
        WM_GETDLGCODE       : Result := InputKeysToDlgCodes(InputKeys);
        WM_KILLFOCUS        : DoKillFocus(FocusedWnd);
--- 515,518 ----
***************
*** 577,591 ****
  begin
    { notification }
-   Perform(CM_LOSTFOCUS, 0 ,0);
  end;
  
! procedure TJvEx##ClassName.GotFocus;
  begin
!   { notification }
  end;
  
  procedure TJvEx##ClassName.LostFocus;
  begin
!   { notification }
  end;
  
--- 575,590 ----
  begin
    { notification }
  end;
  
! procedure TJvEx##ClassName.DoEnter;
  begin
!   Perform(CM_ENTER, 0 ,0);
!   inherited;
  end;
  
  procedure TJvEx##ClassName.LostFocus;
  begin
!   Perform(CM_LEAVE, 0 ,0);
!   inherited;
  end;
  

Index: JvExControls.macros
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExCLX/src/JvExControls.macros,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvExControls.macros	26 Oct 2004 21:24:15 -0000	1.6
--- JvExControls.macros	29 Oct 2004 12:14:17 -0000	1.7
***************
*** 154,159 ****
      procedure DoKillFocus(NextWnd: HWND); dynamic;
      procedure DoSetFocus(PreviousWnd: HWND); dynamic;
-     procedure GotFocus; dynamic;
-     procedure LostFocus; dynamic;
      function DoEraseBackground(ACanvas: TCanvas; LParam: Integer): Boolean; dynamic;
      procedure ShowingChanged; dynamic;
--- 154,157 ----
***************
*** 284,287 ****
--- 282,286 ----
        CM_COLORCHANGED       : ColorChanged;
        CM_ENABLEDCHANGED     : EnabledChanged;
+       CM_FOCUSCHANGED       : FocusChanged;
        CM_FONTCHANGED        : FontChanged;
        CM_TEXTCHANGED        : TextChanged ;
***************
*** 461,466 ****
  (*$DEFINE JV_IMPL_WINCONTROL_MESSAGES
        { WinControl Messages }
-       CM_GOTFOCUS           : GotFocus;
-       CM_LOSTFOCUS          : LostFocus;
        WM_SETFOCUS           : DoSetFocus(FocusedWnd);
        WM_KILLFOCUS          : if not (csFocusing in ControlState) then
--- 460,463 ----
***************
*** 505,518 ****
  
  (*$DEFINE JV_IMPL_WINCONTROL_COMMON(ClassName)
- procedure TJvEx##ClassName.GotFocus;
- begin
-   { notification }
- end;
- 
- procedure TJvEx##ClassName.LostFocus;
- begin
-   { notification }
- end;
- 
  procedure TJvEx##ClassName.DoSetFocus(PreviousWnd: HWND);
  begin
--- 502,505 ----

Index: JvExControls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExCLX/src/JvExControls.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvExControls.pas	26 Oct 2004 21:24:18 -0000	1.4
--- JvExControls.pas	29 Oct 2004 12:14:17 -0000	1.5
***************
*** 59,62 ****
--- 59,63 ----
  
  function GetCanvas(Instance: TWinControl): TControlCanvas;
+ function GetFocusedControl(Instance: TControl): TWinControl;
  function GetHintColor(Instance: TWinControl): TColor;
  function InputKeysToDlgCodes(InputKeys: TInputKeys): Integer;
***************
*** 108,111 ****
--- 109,122 ----
  end;
  
+ function GetFocusedControl(Instance: TControl): TWinControl;
+ var
+   Form: TCustomForm;
+ begin
+   Result := nil;
+   Form := GetParentForm(Instance);
+   if Assigned(Form) then
+     Result := Form.ActiveControl;
+ end;
+ 
  function InputKeysToDlgCodes(InputKeys: TInputKeys): Integer;
  begin

Index: JvQExControls.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/devtools/JvExCLX/src/JvQExControls.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JvQExControls.pas	28 Oct 2004 22:54:26 -0000	1.6
--- JvQExControls.pas	29 Oct 2004 12:14:17 -0000	1.7
***************
*** 82,85 ****
--- 82,86 ----
  function DoClipBoardCommands(Msg: Integer; ClipBoardCommands: TJvClipBoardCommands): Boolean;
  function GetCanvas(Instance: TWinControl): TCanvas;
+ function GetFocusedControl(Instance: TWinControl): TWinControl;
  function GetHintColor(Instance: TWinControl): TColor;
  function InputKeysToDlgCodes(InputKeys: TInputKeys): Integer;
***************
*** 165,169 ****
  end;
  
! function GetFocusedWnd(Instance: TWidgetControl): QWidgetH;
  var
    Form: TCustomForm;
--- 166,170 ----
  end;
  
! function GetFocusedControl(Instance: TWidgetControl): TWidgetControl;
  var
    Form: TCustomForm;
***************
*** 171,176 ****
    Result := nil;
    Form := GetParentForm(Instance);
!   if Assigned(Form) and Assigned(Form.FocusedControl) then
!     Result := Form.FocusedControl.Handle ;
  end;
  
--- 172,187 ----
    Result := nil;
    Form := GetParentForm(Instance);
!   if Assigned(Form) then
!     Result := Form.FocusedControl;
! end;
! 
! function GetFocusedWnd(Instance: TWidgetControl): QWidgetH;
! var
!   Control: TWinControl;
! begin
!   Result := nil;
!   Control := GetFocusedControl(Instance);
!   if Assigned(Control) then
!     Result := Control.Handle ;
  end;