Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/run JvJCLUtils.pas,1.55,1.56 JvJVCLUtils.pas,1.62,1.63 JvThemes.pas,1.33,1.34 - Made compilabe under Windows.
|
From: Andreas H. <ah...@us...> - 2004-01-10 16:37:27
|
Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv16410/run
Modified Files:
JvJCLUtils.pas JvJVCLUtils.pas JvThemes.pas
Log Message:
Made compilabe under Windows.
Index: JvJCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJCLUtils.pas,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** JvJCLUtils.pas 10 Jan 2004 15:16:40 -0000 1.55
--- JvJCLUtils.pas 10 Jan 2004 16:37:19 -0000 1.56
***************
*** 71,75 ****
{$ENDIF VCL}
{$IFDEF VisualCLX}
! Qt, QStdCtrls, QGraphics, QClipbrd, QWindows, Types, DateUtils,
{$ENDIF VisualCLX}
{$IFDEF COMPILER6_UP}
--- 71,75 ----
{$ENDIF VCL}
{$IFDEF VisualCLX}
! Qt, QStdCtrls, QGraphics, QClipbrd, QWindows, Types,
{$ENDIF VisualCLX}
{$IFDEF COMPILER6_UP}
***************
*** 456,462 ****
{ begin JvDateUtil }
- {$IFDEF MSWINDOWS}
function CurrentYear: Word;
- {$ENDIF}
function IsLeapYear(AYear: Integer): Boolean;
function DaysPerMonth(AYear, AMonth: Integer): Integer;
--- 456,460 ----
***************
*** 497,504 ****
function DefDateMask(BlanksChar: Char; AFourDigitYear: Boolean): string;
- {$IFDEF MSWINDOWS}
function FormatLongDate(Value: TDateTime): string;
function FormatLongDateTime(Value: TDateTime): string;
- {$ENDIF}
{ end JvDateUtil }
--- 495,500 ----
***************
*** 560,564 ****
{ CenterStr centers the characters in the string based upon the
Len specified. }
- {$IFDEF MSWINDOWS}
function CompStr(const S1, S2: string): Integer;
{ CompStr compares S1 to S2, with case-sensitivity. The return value is
--- 556,559 ----
***************
*** 567,571 ****
{ CompText compares S1 to S2, without case-sensitivity. The return value
is the same as for CompStr. }
- {$ENDIF}
function Copy2Symb(const S: string; Symb: Char): string;
{ Copy2Symb returns a substring of a string S from begining to first
--- 562,565 ----
***************
*** 722,726 ****
//Raise the last Exception
procedure RaiseLastWin32; overload;
! procedure RaiseLastWin32(Text: string); overload;
//Raise the last Exception with a small comment from your part
--- 716,720 ----
//Raise the last Exception
procedure RaiseLastWin32; overload;
! procedure RaiseLastWin32(const Text: string); overload;
//Raise the last Exception with a small comment from your part
***************
*** 959,976 ****
{$IFDEF VCL}
! {$IFDEF BCB}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass: ShortString;
const ATitle: string): Boolean;
! {$ELSE}
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF BCB}
{$ENDIF VCL}
{$IFDEF MSWINDOWS}
{ BrowseForFolder displays Browse For Folder dialog }
function BrowseForFolder(const Handle: HWND; const Title: string; var Folder: string): Boolean;
! {$ENDIF}
procedure AntiAlias(Clip: TBitmap);
--- 953,971 ----
{$IFDEF VCL}
! {$IFDEF BCB}
function FindPrevInstance(const MainFormClass: ShortString;
const ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass: ShortString;
const ATitle: string): Boolean;
! {$ELSE}
function FindPrevInstance(const MainFormClass, ATitle: string): HWND;
function ActivatePrevInstance(const MainFormClass, ATitle: string): Boolean;
! {$ENDIF BCB}
{$ENDIF VCL}
+
{$IFDEF MSWINDOWS}
{ BrowseForFolder displays Browse For Folder dialog }
function BrowseForFolder(const Handle: HWND; const Title: string; var Folder: string): Boolean;
! {$ENDIF MSWINDOWS}
procedure AntiAlias(Clip: TBitmap);
***************
*** 3756,3760 ****
end;
! {$IFDEF WINDOWS}
procedure ReadIcon(Stream: TStream; var Icon: HICON; ImageCount: Integer;
StartOffset: Integer);
--- 3751,3755 ----
end;
! {$IFDEF MSWINDOWS}
procedure ReadIcon(Stream: TStream; var Icon: HICON; ImageCount: Integer;
StartOffset: Integer);
***************
*** 3862,3866 ****
end;
end;
! {$ENDIF WINDOWS}
{$IFDEF VCL}
--- 3857,3861 ----
end;
end;
! {$ENDIF MSWINDOWS}
{$IFDEF VCL}
***************
*** 4304,4316 ****
end;
- {$IFDEF MSWINDOWS}
function CurrentYear: Word;
- var
- SystemTime: TSystemTime;
begin
! GetLocalTime(SystemTime);
! Result := SystemTime.wYear;
end;
- {$ENDIF}
{ String to date conversions. Copied from SYSUTILS.PAS unit. }
--- 4299,4306 ----
end;
function CurrentYear: Word;
begin
! Result := ExtractYear(Date);
end;
{ String to date conversions. Copied from SYSUTILS.PAS unit. }
***************
*** 4398,4414 ****
function CurrentMonth: Word;
- {$IFDEF WINDOWS}
- var
- SystemTime: TSystemTime;
begin
! GetLocalTime(SystemTime);
! Result := SystemTime.wMonth;
! end;
! {$ENDIF}
! {$IFDEF LINUX}
! begin
! Result := MonthOfTheYear(Now);
end;
- {$ENDIF}
--- 4388,4394 ----
function CurrentMonth: Word;
begin
! Result := ExtractMonth(Date);
end;
***************
*** 4677,4682 ****
end;
- {$IFDEF MSWINDOWS}
function FormatLongDate(Value: TDateTime): string;
var
Buffer: array[0..1023] of Char;
--- 4657,4662 ----
end;
function FormatLongDate(Value: TDateTime): string;
+ {$IFDEF MSWINDOWS}
var
Buffer: array[0..1023] of Char;
***************
*** 4688,4691 ****
--- 4668,4677 ----
Result := TrimRight(Result);
end;
+ {$ENDIF MSWINDOWS}
+ {$IFDEF LINUX}
+ begin
+ Result := TrimRight(FormatDateTime(LongDateFormat, Value));
+ end;
+ {$ENDIF LINUX}
function FormatLongDateTime(Value: TDateTime): string;
***************
*** 4696,4700 ****
Result := '';
end;
- {$ENDIF}
function FourDigitYear: Boolean;
--- 4682,4685 ----
***************
*** 4889,4893 ****
end;
! function MakeStr(C: Char; N: Integer): string;
begin
if N < 1 then
--- 4874,4878 ----
end;
! function MakeStr(C: Char; N: Integer): string; overload;
begin
if N < 1 then
***************
*** 4900,4904 ****
end;
! function MakeStr(C: WideChar; N: Integer): WideString;
begin
if N < 1 then
--- 4885,4889 ----
end;
! function MakeStr(C: WideChar; N: Integer): WideString; overload;
begin
if N < 1 then
***************
*** 4977,4980 ****
--- 4962,4976 ----
end;
{$ENDIF}
+ {$IFDEF LINUX}
+ function CompStr(const S1, S2: string): Integer;
+ begin
+ Result := AnsiCompareStr(S1, S2);
+ end;
+
+ function CompText(const S1, S2: string): Integer;
+ begin
+ Result := AnsiCompareText(S1, S2);
+ end;
+ {$ENDIF LINUX}
function Copy2Symb(const S: string; Symb: Char): string;
***************
*** 5833,5840 ****
{$IFDEF MSWINDOWS}
TempFile: array [0..MAX_PATH] of Char;
! {$ENDIF}
{$IFDEF LINUX}
TempFile: string;
! {$ENDIF}
STempDir: TFileName;
Res: Integer;
--- 5829,5836 ----
{$IFDEF MSWINDOWS}
TempFile: array [0..MAX_PATH] of Char;
! {$ENDIF MSWINDOWS}
{$IFDEF LINUX}
TempFile: string;
! {$ENDIF LINUX}
STempDir: TFileName;
Res: Integer;
***************
*** 5861,5865 ****
{$ENDIF MSWINDOWS}
{$IFDEF LINUX}
! // TempFile := GetTempFileName('~JV');
{$ENDIF LINUX}
if Res <> 0 then
--- 5857,5862 ----
{$ENDIF MSWINDOWS}
{$IFDEF LINUX}
! TempFile := GetTempFileName('~JV');
! Result := 1;
{$ENDIF LINUX}
if Res <> 0 then
***************
*** 6102,6106 ****
{$IFDEF MSWINDOWS}
! function FileLock(Handle: Integer; Offset, LockSize: Longint): Integer;
begin
if LockFile(Handle, Offset, 0, LockSize, 0) then
--- 6099,6103 ----
{$IFDEF MSWINDOWS}
! function FileLock(Handle: Integer; Offset, LockSize: Longint): Integer; overload;
begin
if LockFile(Handle, Offset, 0, LockSize, 0) then
***************
*** 6110,6114 ****
end;
! function FileUnlock(Handle: Integer; Offset, LockSize: Longint): Integer;
begin
if UnlockFile(Handle, Offset, 0, LockSize, 0) then
--- 6107,6111 ----
end;
! function FileUnlock(Handle: Integer; Offset, LockSize: Longint): Integer; overload;
begin
if UnlockFile(Handle, Offset, 0, LockSize, 0) then
***************
*** 6118,6122 ****
end;
! function FileLock(Handle: Integer; Offset, LockSize: Int64): Integer;
begin
if LockFile(Handle, Int64Rec(Offset).Lo, Int64Rec(Offset).Hi,
--- 6115,6119 ----
end;
! function FileLock(Handle: Integer; Offset, LockSize: Int64): Integer; overload;
begin
if LockFile(Handle, Int64Rec(Offset).Lo, Int64Rec(Offset).Hi,
***************
*** 6127,6131 ****
end;
! function FileUnlock(Handle: Integer; Offset, LockSize: Int64): Integer;
begin
if UnlockFile(Handle, Int64Rec(Offset).Lo, Int64Rec(Offset).Hi,
--- 6124,6128 ----
end;
! function FileUnlock(Handle: Integer; Offset, LockSize: Int64): Integer; overload;
begin
if UnlockFile(Handle, Int64Rec(Offset).Lo, Int64Rec(Offset).Hi,
***************
*** 6379,6388 ****
end;
! procedure RaiseLastWin32;
begin
PError('');
end;
! procedure RaiseLastWin32(Text: string);
begin
PError(Text);
--- 6376,6385 ----
end;
! procedure RaiseLastWin32; overload;
begin
PError('');
end;
! procedure RaiseLastWin32(const Text: string); overload;
begin
PError(Text);
***************
*** 7470,7488 ****
begin
if Size > 0 then
! {$IFDEF MSWINDOWS}
! {$WARNINGS OFF}
Result := GlobalAllocPtr(HeapAllocFlags or GMEM_ZEROINIT, Size)
! {$WARNINGS ON}
! {$ENDIF MSWINDOWS}
! {$IFDEF LINUX}
! begin
! Result := Libc.malloc(Size + 4);
! if Result <> nil then
! begin
! PInteger(Result)^ := Size;
! Result := Pointer(Integer(Result) + SizeOf(Integer));
! end;
! end
! {$ENDIF LINUX}
else
Result := nil;
--- 7467,7473 ----
begin
if Size > 0 then
! {$WARNINGS OFF} // HeapAllocFlags is platform
Result := GlobalAllocPtr(HeapAllocFlags or GMEM_ZEROINIT, Size)
! {$WARNINGS ON}
else
Result := nil;
***************
*** 7491,7509 ****
function ReallocMemo(fpBlock: Pointer; Size: Longint): Pointer;
begin
! {$IFDEF MSWINDOWS}
! {$WARNINGS OFF}
! Result := GlobalReallocPtr(fpBlock, Size,
! HeapAllocFlags or GMEM_ZEROINIT);
! {$WARNINGS ON}
! {$ENDIF MSWINDOWS}
! {$IFDEF LINUX}
! fpBlock := Pointer(Integer(fpBlock) - SizeOf(Integer));
! Result := Libc.realloc(fpBlock, Size);
! if Result <> nil then
! begin
! PInteger(Result)^ := Size;
! Result := Pointer(Integer(Result) + SizeOf(Integer));
! end;
! {$ENDIF LINUX}
end;
--- 7476,7482 ----
function ReallocMemo(fpBlock: Pointer; Size: Longint): Pointer;
begin
! {$WARNINGS OFF} // HeapAllocFlags is platform
! Result := GlobalReallocPtr(fpBlock, Size, HeapAllocFlags or GMEM_ZEROINIT);
! {$WARNINGS ON}
end;
***************
*** 7512,7522 ****
if fpBlock <> nil then
begin
- {$IFDEF MSWINDOWS}
GlobalFreePtr(fpBlock);
- {$ENDIF MSWINDOWS}
- {$IFDEF LINUX}
- fpBlock := Pointer(Integer(fpBlock) - SizeOf(Integer));
- Libc.free(fpBlock);
- {$ENDIF LINUX}
fpBlock := nil;
end;
--- 7485,7489 ----
***************
*** 7524,7544 ****
function GetMemoSize(fpBlock: Pointer): Longint;
- {$IFDEF MSWINDOWS}
var
hMem: THandle;
- {$ENDIF}
begin
Result := 0;
if fpBlock <> nil then
begin
- {$IFDEF MSWINDOWS}
hMem := GlobalHandle(fpBlock);
if hMem <> 0 then
Result := GlobalSize(hMem);
- {$ENDIF MSWINDOWS}
- {$IFDEF LINUX}
- fpBlock := Pointer(Integer(fpBlock) - SizeOf(Integer));
- Result := PInteger(fpBlock)^;
- {$ENDIF LINUX}
end;
end;
--- 7491,7503 ----
***************
*** 7895,7902 ****
{$IFDEF VCL}
hwndOwner := Handle;
! {$ENDIF}
{$IFDEF VisualCLX}
hwndOwner := QWidget_WinID(handle);
! {$ENDIF}
pidlRoot := nil;
pszDisplayName := FN;
--- 7854,7861 ----
{$IFDEF VCL}
hwndOwner := Handle;
! {$ENDIF VCL}
{$IFDEF VisualCLX}
hwndOwner := QWidget_WinID(handle);
! {$ENDIF VisualCLX}
pidlRoot := nil;
pszDisplayName := FN;
Index: JvJVCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJVCLUtils.pas,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** JvJVCLUtils.pas 10 Jan 2004 15:16:40 -0000 1.62
--- JvJVCLUtils.pas 10 Jan 2004 16:37:19 -0000 1.63
***************
*** 39,43 ****
{$IFDEF LINUX}
Libc,
! {$ENDIF}
SysUtils, Classes,
{$IFDEF VCL}
--- 39,43 ----
{$IFDEF LINUX}
Libc,
! {$ENDIF LINUX}
SysUtils, Classes,
{$IFDEF VCL}
***************
*** 220,224 ****
function LoadOLEDragCursors: Boolean;
// set some default cursor from JVCL
! {$ENDIF}
procedure SetDefaultJVCLCursors;
--- 220,224 ----
function LoadOLEDragCursors: Boolean;
// set some default cursor from JVCL
! {$ENDIF MSWINDOWS}
procedure SetDefaultJVCLCursors;
***************
*** 586,594 ****
SysConst,
{$IFDEF VCL}
! Consts, CommCtrl, MMSystem, ShlObj, ActiveX,
{$ENDIF}
{$IFDEF VisualCLX}
QConsts,
! {$ENDIF}
Math,
JclSysInfo, JvConsts, JvProgressUtils, JvResources;
--- 586,597 ----
SysConst,
{$IFDEF VCL}
! Consts,
{$ENDIF}
+ {$IFDEF MSWINDOWS}
+ CommCtrl, MMSystem, ShlObj, ActiveX,
+ {$ENDIF MSWINDOWS}
{$IFDEF VisualCLX}
QConsts,
! {$ENDIF VisualCLX}
Math,
JclSysInfo, JvConsts, JvProgressUtils, JvResources;
***************
*** 767,771 ****
QColor_destroy(QC);
end;
! {$ENDIF}
(* (rom) to be deleted. Use ScreenShot from JCL
--- 770,774 ----
QColor_destroy(QC);
end;
! {$ENDIF VisualCLX}
(* (rom) to be deleted. Use ScreenShot from JCL
***************
*** 874,878 ****
SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, nil, SPIF_SENDWININICHANGE);
end;
-
{$ENDIF MSWINDOWS}
--- 877,880 ----
***************
*** 2352,2356 ****
{$IFDEF MSWINDOWS}
if not SystemParametersInfo(SPI_GETWORKAREA, 0, @Result, 0) then
! {$ENDIF}
with Screen do
Result := Bounds(0, 0, Width, Height);
--- 2354,2358 ----
{$IFDEF MSWINDOWS}
if not SystemParametersInfo(SPI_GETWORKAREA, 0, @Result, 0) then
! {$ENDIF MSWINDOWS}
with Screen do
Result := Bounds(0, 0, Width, Height);
***************
*** 2759,2763 ****
end;
end;
! {$ENDIF}
procedure SetDefaultJVCLCursors;
--- 2761,2765 ----
end;
end;
! {$ENDIF MSWINDOWS}
procedure SetDefaultJVCLCursors;
Index: JvThemes.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvThemes.pas,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** JvThemes.pas 10 Jan 2004 15:16:40 -0000 1.33
--- JvThemes.pas 10 Jan 2004 16:37:19 -0000 1.34
***************
*** 52,61 ****
SysUtils, Classes;
- {$IFDEF VCL}
const
// Add a message handler to a component that is themed by the ThemeManager but
// should not be themed.
CM_DENYSUBCLASSING = CM_BASE + 2000; // from ThemeMgr.pas
- {$ENDIF}
type
--- 52,59 ----
|