[JVCL-Checkins] CVS: dev/JVCL3/run JvJVCLAboutForm.pas,1.3,1.4 JvJVCLUtils.pas,1.29,1.30 - CLX compatible

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

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

Modified Files:
	JvJVCLAboutForm.pas JvJVCLUtils.pas 
Log Message:
CLX compatible

Index: JvJVCLAboutForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLAboutForm.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvJVCLAboutForm.pas	10 Oct 2003 23:13:33 -0000	1.3
--- JvJVCLAboutForm.pas	24 Nov 2003 17:32:52 -0000	1.4
***************
*** 32,38 ****
  
  uses
!   Windows, Messages, SysUtils, Classes, Controls, Forms, IniFiles, StdCtrls,
!   ExtCtrls,
!   JclSysInfo, JclWin32, JVCLVer, JvBaseDlg, Dialogs, jpeg, Buttons, JvComponent;
  
  type
--- 32,46 ----
  
  uses
! {$IFDEF MSWINDOWS}
!   Windows, Messages, JclWin32,
! {$ENDIF MSWINDOWS}
!   SysUtils, Classes, IniFiles,
! {$IFDEF VCL}
!   Controls, Forms, StdCtrls, ExtCtrls, Dialogs, Buttons, Jpeg,
! {$ENDIF VCL}
! {$IFDEF VisualCLX}
!   QControls, QForms, QStdCtrls, QExtCtrls, QDialogs, QButtons, {Jpeg,}
! {$ENDIF VisualCLX}
!   JclSysInfo, JVCLVer, JvBaseDlg, JvComponent;
  
  type
***************
*** 97,101 ****
    JvJVCLUtils, JvJCLUtils;
  
! {$R *.DFM}
  
  const
--- 105,109 ----
    JvJVCLUtils, JvJCLUtils;
  
! {$R *.dfm}
  
  const
***************
*** 108,118 ****
  
  procedure TJvJVCLAboutForm.FormShow(Sender: TObject);
  var
    VersionInfo: TOSVersionInfoEx;
  begin
    FillChar(VersionInfo, SizeOf(TOSVersionInfoEx), #0);
    VersionInfo.dwOSVersionInfoSize := SizeOf(TOSVersionInfoEx);
    JclWin32.GetVersionEx(@VersionInfo);
-   lblVersion.Caption := 'Version: ' + JVCL_VERSIONSTRING;
    if VersionInfo.wServicePackMajor = 0 then
      lblWindowsVersion.Caption := Format('%s (Build %u)',
--- 116,129 ----
  
  procedure TJvJVCLAboutForm.FormShow(Sender: TObject);
+ {$IFDEF MSWINDOWS}
  var
    VersionInfo: TOSVersionInfoEx;
+ {$ENDIF MSWINDOWS}
  begin
+   lblVersion.Caption := 'Version: ' + JVCL_VERSIONSTRING;
+ {$IFDEF MSWINDOWS}
    FillChar(VersionInfo, SizeOf(TOSVersionInfoEx), #0);
    VersionInfo.dwOSVersionInfoSize := SizeOf(TOSVersionInfoEx);
    JclWin32.GetVersionEx(@VersionInfo);
    if VersionInfo.wServicePackMajor = 0 then
      lblWindowsVersion.Caption := Format('%s (Build %u)',
***************
*** 121,124 ****
--- 132,139 ----
      lblWindowsVersion.Caption := Format('%s (Build %u: %s)',
        [GetWindowsVersionString, VersionInfo.dwBuildNumber, GetWindowsServicePackVersionString]);
+ {$ENDIF MSWINDOWS}
+ {$IFDEF LINUX}
+   lblWindowsVersion.Caption := GetOSVersionString;
+ {$ENDIF LINUX}
    lblMemory.Caption := Format('%u KB', [GetTotalPhysicalMemory div 1024]);
    lblCopyRight.Caption := 'Copyright © Project JEDI, 1999 - ' + FormatDateTime('yyyy', Now);
***************
*** 131,135 ****
--- 146,152 ----
  begin
    ReleaseCapture;
+ {$IFDEF VCL}
    Perform(WM_SYSCOMMAND, SC_MOVE + 2, 0);
+ {$ENDIF VCL}
  end;
  

Index: JvJVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** JvJVCLUtils.pas	24 Nov 2003 07:49:25 -0000	1.29
--- JvJVCLUtils.pas	24 Nov 2003 17:32:52 -0000	1.30
***************
*** 25,29 ****
  
  {$I JVCL.INC}
- {$I WINDOWSONLY.INC}
  
  unit JvJVCLUtils;
--- 25,28 ----
***************
*** 662,668 ****
    Consts, SysConst, CommCtrl, MMSystem, ShlObj, ActiveX, Math,
    JclSysInfo,
-   {$IFDEF VisualCLX}
-   QWinCursors,
-   {$ENDIF VisualCLX}
    JvConsts, JvProgressUtils;
  
--- 661,664 ----