[JVCL-Checkins] CVS: dev/JVCL3/run JvGradient.pas,1.5,1.6 JvInterpreter_JvUtils.pas,1.9,1.10 JvJCLUtils.pas,1.51,1.52 JvJVCLUtils.pas,1.57,1.58 JvSpeedButton.pas,1.14,1.15 - Renamed JvJCLUtils.LastDate to LastDateRUS

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

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

Modified Files:
	JvGradient.pas JvInterpreter_JvUtils.pas JvJCLUtils.pas 
	JvJVCLUtils.pas JvSpeedButton.pas 
Log Message:
Source cleaning
CLX compatibility
Renamed JvJCLUtils.LastDate to LastDateRUS

Index: JvGradient.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvGradient.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JvGradient.pas	8 Jan 2004 16:27:43 -0000	1.5
--- JvGradient.pas	8 Jan 2004 20:22:56 -0000	1.6
***************
*** 32,48 ****
  
  uses
-   SysUtils, Classes,
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
    {$ENDIF VCL}
    {$IFDEF VisualCLX}
!   QGraphics, QControls, Types,
    {$ENDIF VisualCLX}
!   JvTypes, JVCLVer;
  
  type
!   TJvGradient = class(TGraphicControl)
    private
-     FAboutJVCL: TJVCLAboutInfo;
      FStyle: TJvGradStyle;
      FStartColor: TColor;
--- 32,47 ----
  
  uses
    {$IFDEF VCL}
    Windows, Messages, Graphics, Controls,
    {$ENDIF VCL}
+   SysUtils, Classes,
    {$IFDEF VisualCLX}
!   Types, QWindows, QGraphics, QControls,
    {$ENDIF VisualCLX}
!   JvTypes, JVCLVer, JvComponent;
  
  type
!   TJvGradient = class(TJvGraphicControl)
    private
      FStyle: TJvGradStyle;
      FStartColor: TColor;
***************
*** 63,67 ****
      destructor Destroy; override;
    published
-     property AboutJVCL: TJVCLAboutInfo read FAboutJVCL write FAboutJVCL stored False;
      property Align default alClient;
      property ShowHint;
--- 62,65 ----

Index: JvInterpreter_JvUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvInterpreter_JvUtils.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JvInterpreter_JvUtils.pas	5 Jan 2004 22:37:43 -0000	1.9
--- JvInterpreter_JvUtils.pas	8 Jan 2004 20:22:56 -0000	1.10
***************
*** 563,571 ****
  end;
  
! { function LastDate(const Dat: TDateTime): string; }
  
! procedure JvInterpreter_LastDate(var Value: Variant; Args: TJvInterpreterArgs);
  begin
!   Value := LastDate(Args.Values[0]);
  end;
  
--- 563,571 ----
  end;
  
! { function LastDateRUS(const Dat: TDateTime): string; }
  
! procedure JvInterpreter_LastDateRUS(var Value: Variant; Args: TJvInterpreterArgs);
  begin
!   Value := LastDateRUS(Args.Values[0]);
  end;
  
***************
*** 1054,1058 ****
      AddFunction(cJvStrUtil, 'Spaces', JvInterpreter_Spaces, 1, [varInteger], varEmpty);
      AddFunction(cJvStrUtil, 'AddSpaces', JvInterpreter_AddSpaces, 2, [varString, varInteger], varEmpty);
!     AddFunction(cJvStrUtil, 'LastDate', JvInterpreter_LastDate, 1, [varEmpty], varEmpty);
      AddFunction(cJvStrUtil, 'CurrencyToStr', JvInterpreter_CurrencyToStr, 1, [varEmpty], varEmpty);
      AddFunction(cJvStrUtil, 'Cmp', JvInterpreter_Cmp, 2, [varString, varString], varEmpty);
--- 1054,1058 ----
      AddFunction(cJvStrUtil, 'Spaces', JvInterpreter_Spaces, 1, [varInteger], varEmpty);
      AddFunction(cJvStrUtil, 'AddSpaces', JvInterpreter_AddSpaces, 2, [varString, varInteger], varEmpty);
!     AddFunction(cJvStrUtil, 'LastDateRUS', JvInterpreter_LastDateRUS, 1, [varEmpty], varEmpty);
      AddFunction(cJvStrUtil, 'CurrencyToStr', JvInterpreter_CurrencyToStr, 1, [varEmpty], varEmpty);
      AddFunction(cJvStrUtil, 'Cmp', JvInterpreter_Cmp, 2, [varString, varString], varEmpty);

Index: JvJCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJCLUtils.pas,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** JvJCLUtils.pas	8 Jan 2004 17:58:17 -0000	1.51
--- JvJCLUtils.pas	8 Jan 2004 20:22:56 -0000	1.52
***************
*** 163,169 ****
  function AddSpaces(const S: string; const N: Integer): string;
  function AddSpacesW(const S: WideString; const N: Integer): WideString;
! { function LastDate for russian users only }
  //  { returns date relative to current date: 'äâà äíÿ íàçàä' }
! function LastDate(const Dat: TDateTime): string;
  { CurrencyToStr format currency, Cur, using ffCurrency float format}
  function CurrencyToStr(const Cur: currency): string;
--- 163,169 ----
  function AddSpaces(const S: string; const N: Integer): string;
  function AddSpacesW(const S: WideString; const N: Integer): WideString;
[...1958 lines suppressed...]
  
--- 7936,7941 ----
***************
*** 7984,7987 ****
--- 7953,7958 ----
  end;
  
+ {$ENDIF VCL}
+ 
  procedure SetWindowTop(const Handle: HWND; const Top: Boolean);
  const
***************
*** 7991,7996 ****
      SWP_NOSIZE or SWP_NOACTIVATE);
  end;
- 
- {$ENDIF VCL}
  
  function MakeVariant(const Values: array of Variant): Variant;
--- 7962,7965 ----

Index: JvJVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** JvJVCLUtils.pas	5 Jan 2004 21:36:12 -0000	1.57
--- JvJVCLUtils.pas	8 Jan 2004 20:22:56 -0000	1.58
***************
*** 184,195 ****
  {$ENDIF VCL}
  
! {$IFDEF MSWINDOWS}
! function PointInPolyRgn(const P: TPoint; const Points: array of TPoint):
!   Boolean;
  function PaletteColor(Color: TColor): Longint;
  procedure PaintInverseRect(const RectOrg, RectEnd: TPoint);
  procedure DrawInvertFrame(ScreenRect: TRect; Width: Integer);
  procedure ShowMDIClientEdge(ClientHandle: THandle; ShowEdge: Boolean);
! {$ENDIF MSWINDOWS}
  procedure Delay(MSecs: Longint);
  procedure CenterControl(Control: TControl);
--- 184,194 ----
  {$ENDIF VCL}
  
! function PointInPolyRgn(const P: TPoint; const Points: array of TPoint): Boolean;
  function PaletteColor(Color: TColor): Longint;
+ {$IFDEF VCL}
  procedure PaintInverseRect(const RectOrg, RectEnd: TPoint);
  procedure DrawInvertFrame(ScreenRect: TRect; Width: Integer);
  procedure ShowMDIClientEdge(ClientHandle: THandle; ShowEdge: Boolean);
! {$ENDIF VCL}
  procedure Delay(MSecs: Longint);
  procedure CenterControl(Control: TControl);
***************
*** 2121,2133 ****
  procedure PaintInverseRect(const RectOrg, RectEnd: TPoint);
  var
!   DC: HDC;
    r: TRect;
  begin
!   DC := GetDC(0);
    try
      r := Rect(RectOrg.X, RectOrg.Y, RectEnd.X, RectEnd.Y);
!     InvertRect(DC, r);
    finally
!     ReleaseDC(0, DC);
    end;
  end;
--- 2120,2132 ----
  procedure PaintInverseRect(const RectOrg, RectEnd: TPoint);
  var
!   DC: Windows.HDC;
    r: TRect;
  begin
!   DC := Windows.GetDC(0);
    try
      r := Rect(RectOrg.X, RectOrg.Y, RectEnd.X, RectEnd.Y);
!     Windows.InvertRect(DC, r);
    finally
!     Windows.ReleaseDC(0, DC);
    end;
  end;
***************
*** 2135,2150 ****
  procedure DrawInvertFrame(ScreenRect: TRect; Width: Integer);
  var
!   DC: HDC;
    i: Integer;
  begin
!   DC := GetDC(0);
    try
      for i := 1 to Width do
      begin
!       DrawFocusRect(DC, ScreenRect);
!       InflateRect(ScreenRect, -1, -1);
      end;
    finally
!     ReleaseDC(0, DC);
    end;
  end;
--- 2134,2149 ----
  procedure DrawInvertFrame(ScreenRect: TRect; Width: Integer);
  var
!   DC: Windows.HDC;
    i: Integer;
  begin
!   DC := Windows.GetDC(0);
    try
      for i := 1 to Width do
      begin
!       Windows.DrawFocusRect(DC, ScreenRect);
!       //InflateRect(ScreenRect, -1, -1);
      end;
    finally
!     Windows.ReleaseDC(0, DC);
    end;
  end;
***************
*** 2302,2306 ****
  end;
  
! {$IFDEF MSWINDOWS}
  { ShowMDIClientEdge function has been copied from Inprise's FORMS.PAS unit,
    Delphi 4 version }
--- 2301,2305 ----
  end;
  
! {$IFDEF VCL}
  { ShowMDIClientEdge function has been copied from Inprise's FORMS.PAS unit,
    Delphi 4 version }
***************
*** 2328,2332 ****
    end;
  end;
! {$ENDIF}
  
  {$IFDEF VCL}
--- 2327,2331 ----
    end;
  end;
! {$ENDIF VCL}
  
  {$IFDEF VCL}

Index: JvSpeedButton.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSpeedButton.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** JvSpeedButton.pas	5 Jan 2004 22:37:44 -0000	1.14
--- JvSpeedButton.pas	8 Jan 2004 20:22:56 -0000	1.15
***************
*** 41,52 ****
    Windows, Messages,
    {$ENDIF MSWINDOWS}
-   SysUtils, Classes,
    {$IFDEF VCL}
    Controls, Graphics, Forms, ExtCtrls, Buttons, Menus, ImgList, ActnList,
    CommCtrl,
    {$ENDIF VCL}
    {$IFDEF VisualCLX}
!   Types, Qt, QTypes, QControls, QGraphics, QForms, QExtCtrls, QButtons, QMenus,
!   QImgList, QActnList, QWindows,
    {$ENDIF VisualCLX}
    JvComponent, JvConsts, JvTypes, JvJCLUtils, JvJVCLUtils;
--- 41,53 ----
    Windows, Messages,
    {$ENDIF MSWINDOWS}
    {$IFDEF VCL}
    Controls, Graphics, Forms, ExtCtrls, Buttons, Menus, ImgList, ActnList,
    CommCtrl,
    {$ENDIF VCL}
+   SysUtils, Classes,
    {$IFDEF VisualCLX}
!   Types, Qt, QTypes, QWindows,
!   QControls, QGraphics, QForms, QExtCtrls, QButtons, QMenus, QImgList,
!   QActnList,
    {$ENDIF VisualCLX}
    JvComponent, JvConsts, JvTypes, JvJCLUtils, JvJVCLUtils;
***************
*** 850,854 ****
        {$IFDEF JVCLThemesEnabled}
        ThemeServices.ThemesEnabled or
!       {$ENDIF}
        FHotTrack or
        (FFlat and not FMouseInControl and Enabled and (DragMode <> dmAutomatic) and (GetCapture = 0));
--- 851,855 ----
        {$IFDEF JVCLThemesEnabled}
        ThemeServices.ThemesEnabled or
!       {$ENDIF JVCLThemesEnabled}
        FHotTrack or
        (FFlat and not FMouseInControl and Enabled and (DragMode <> dmAutomatic) and (GetCapture = 0));
***************
*** 1100,1104 ****
          if CheckMenuDropdown(PointToSmallPoint(P), False) then
            DoMouseUp(Button, Shift, X, Y);
!         {$IFDEF MSWINDOWS}
          if PeekMessage(Msg, 0, 0, 0, PM_NOREMOVE) then
          begin
--- 1101,1105 ----
          if CheckMenuDropdown(PointToSmallPoint(P), False) then
            DoMouseUp(Button, Shift, X, Y);
!         {$IFDEF VCL}
          if PeekMessage(Msg, 0, 0, 0, PM_NOREMOVE) then
          begin
***************
*** 1110,1114 ****
            end;
          end;
!         {$ENDIF MSWINDOWS}
        finally
          FMenuTracking := False;
--- 1111,1115 ----
            end;
          end;
!         {$ENDIF VCL}
        finally
          FMenuTracking := False;