[JVCL-Checkins] CVS: dev/JVCL3/run JvClxUtils.pas,1.3,1.4 JvInspector.pas,1.22,1.23 JvThemes.pas,1.23,1.24

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv30729/run

Modified Files:
	JvClxUtils.pas JvInspector.pas JvThemes.pas 
Log Message:
JvInspector goes CLX (not complete)

Index: JvClxUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvClxUtils.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvClxUtils.pas	31 Oct 2003 09:18:37 -0000	1.3
--- JvClxUtils.pas	11 Nov 2003 23:27:04 -0000	1.4
***************
*** 52,55 ****
--- 52,74 ----
  {$IFDEF COMPLIB_CLX}
  
+ const
+   VK_UP = Key_Up;
+   VK_DOWN = Key_Down;
+   VK_RIGHT = Key_Right;
+   VK_LEFT = Key_Left;
+   VK_ESCAPE = Key_Escape;
+   VK_TAB = Key_Tab;
+   VK_SPACE = Key_Space;
+   VK_ENTER = Key_Enter;
+   VK_RETURN = KEy_Return;
+   VK_BACKTAB = Key_Backtab;
+   VK_BACKSPACE = Key_Backspace;
+   VK_PRIOR = Key_Prior;
+   VK_NEXT = Key_Next;
+   VK_HOME = Key_Home;
+   VK_END = Key_End;
+   VK_ADD = Key_Plus;
+   VK_SUBTRACT = Key_Minus;
+ 
  function GetSysColor(Color: Integer): TColorRef;
  

Index: JvInspector.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInspector.pas,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JvInspector.pas	5 Nov 2003 13:33:54 -0000	1.22
--- JvInspector.pas	11 Nov 2003 23:27:05 -0000	1.23
***************
*** 49,55 ****
  
  uses
!   SysUtils, Windows, Classes, Contnrs, TypInfo, Controls, StdCtrls, Graphics,
!   Messages, IniFiles,
!   JvComponent, JvTypes;
  
  resourcestring
--- 49,64 ----
  
  uses
[...1238 lines suppressed...]
+   if Index > -1 then
+     TopIndex := Index;
+   Result := True;
+ end;
+ {$ENDIF}
+ procedure TJvCustomInspector.ShowScrollBars(Bar: Integer; Visible: Boolean);
+ begin
+ {$IFDEF COMPLIB_VCL}
+   ShowScrollBar(Handle, Bar, Visible);
+ {$ENDIF}
+ {$IFDEF COMPLIB_CLX}
+   if Bar and SB_HORZ <> 0 then
+     FHorzScrollBar.Visible := Visible;
+   if Bar and SB_VERT <> 0 then
+     FVertScrollBar.Visible := Visible;
+ {$ENDIF}
+ end;
+ 
  
  initialization

Index: JvThemes.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvThemes.pas,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** JvThemes.pas	24 Oct 2003 09:12:13 -0000	1.23
--- JvThemes.pas	11 Nov 2003 23:27:05 -0000	1.24
***************
*** 41,45 ****
  {$ENDIF}
  {$IFDEF COMPLIB_CLX}
!   QControls, QGraphics, QButtons,
  {$ENDIF}
    SysUtils, Classes;
--- 41,45 ----
  {$ENDIF}
  {$IFDEF COMPLIB_CLX}
!   QControls, QForms, QGraphics, QButtons,
  {$ENDIF}
    SysUtils, Classes;
***************
*** 754,758 ****
  procedure DrawThemedBackground(Control: TControl; Canvas: TCanvas;
    const R: TRect; Color: TColor; NeedsParentBackground: Boolean = True); overload;
! {$IFDEF MSWINDOWS}
  procedure DrawThemedBackground(Control: TControl; DC: HDC; const R: TRect;
    Brush: HBRUSH; NeedsParentBackground: Boolean = True);  overload;
--- 754,758 ----
  procedure DrawThemedBackground(Control: TControl; Canvas: TCanvas;
    const R: TRect; Color: TColor; NeedsParentBackground: Boolean = True); overload;
! {$IFDEF COMPLIB_VCL}
  procedure DrawThemedBackground(Control: TControl; DC: HDC; const R: TRect;
    Brush: HBRUSH; NeedsParentBackground: Boolean = True);  overload;
***************
*** 766,770 ****
    R: PRect = nil); overload;
  procedure PerformEraseBackground(Control: TControl; DC: HDC; R: PRect = nil); overload;
! {$ENDIF MSWINDOWS}
  
  { DrawThemedButtonFace draws a themed button when theming is enabled. }
--- 766,775 ----
    R: PRect = nil); overload;
  procedure PerformEraseBackground(Control: TControl; DC: HDC; R: PRect = nil); overload;
! {$ENDIF COMPLIB_VCL}
! 
! {$IFDEF COMPLIB_CLX}
! type
!   TButtonStyle = (bsAutoDetect, bsWin31, bsNew);
! {$ENDIF}
  
  { DrawThemedButtonFace draws a themed button when theming is enabled. }
***************
*** 827,831 ****
  end;
  
! {$IFDEF MSWINDOWS}
  
  procedure PerformEraseBackground(Control: TControl; DC: HDC; Offset: TPoint; R: PRect = nil);
--- 832,836 ----
  end;
  
! {$IFDEF COMPLIB_VCL}
  
  procedure PerformEraseBackground(Control: TControl; DC: HDC; Offset: TPoint; R: PRect = nil);
***************
*** 1003,1007 ****
  end;
  
! {$ENDIF MSWINDOWS}
  
  function DrawThemedButtonFace(Control: TControl; Canvas: TCanvas; const Client: TRect;
--- 1008,1012 ----
  end;
  
! {$ENDIF COMPLIB_VCL}
  
  function DrawThemedButtonFace(Control: TControl; Canvas: TCanvas; const Client: TRect;
***************
*** 1037,1041 ****
--- 1042,1051 ----
    else
  {$ENDIF}
+ {$IFDEF COMPLIB_VCL}
    Result := DrawButtonFace(Canvas, Client, BevelWidth, Style, IsRounded, IsDown, IsFocused);
+ {$ENDIF}
+ {$IFDEF COMPLIB_CLX}
+   Result := DrawButtonFace(Canvas, Client, BevelWidth, IsDown, IsFocused);
+ {$ENDIF}
  end;