paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-15 11:49:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

64bit fixes

Browse Source 
git-svn-id: trunk@9795 -
This commit is contained in:
mattias 2006-09-02 20:41:45 +00:00
parent 2f449c60a7
commit cdb8224a6c
10 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/intfbasewinapi.inc
View File

@ -879,7 +879,7 @@ begin
Result := False;
end;
function TWidgetSet.GetStockObject(Value: Integer): LongInt;
function TWidgetSet.GetStockObject(Value: Integer): THandle;
begin
Result := 0;
end;

2
lcl/include/winapi.inc
View File

@ -401,7 +401,7 @@ begin
Result := WidgetSet.GetScrollInfo(Handle, SBStyle, ScrollInfo);
end;
function GetStockObject(Value : Integer): Longint;
function GetStockObject(Value : Integer): THandle;
begin
Result := WidgetSet.GetStockObject(Value);
end;

2
lcl/include/winapih.inc
View File

@ -129,7 +129,7 @@ function GetROP2(DC: HDC): integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetScrollInfo(Handle: HWND; SBStyle: Integer; var ScrollInfo: TScrollInfo): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
//function GetScrollPos --> independent
//function GetScrollRange --> independent
function GetStockObject(Value: Integer): LongInt; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetStockObject(Value: Integer): THandle; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetSysColor(nIndex: Integer): DWORD; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetSystemPaletteEntries(DC: HDC; StartIndex, NumEntries: UINT;
var PaletteEntries): UINT; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}

2
lcl/interfaces/gtk/gtkproc.inc
View File

@ -3591,7 +3591,7 @@ end;
Generic function which calls the WindowProc if defined, otherwise the
dispatcher
------------------------------------------------------------------------------}
function DeliverMessage(const Target: Pointer; var AMessage): Integer;
function DeliverMessage(const Target: Pointer; var AMessage): PtrInt;
begin
if Target=nil then DebugLn('[DeliverMessage] Target = nil');
{$IFDEF VerboseDeliverMessage}

2
lcl/interfaces/gtk/gtkproc.pp
View File

@ -372,7 +372,7 @@ procedure Set_RC_Name(Sender: TObject; AWidget: PGtkWidget);
// messages
function DeliverPostMessage(const Target: Pointer; var TheMessage): GBoolean;
function DeliverMessage(const Target: Pointer; var AMessage): Integer;
function DeliverMessage(const Target: Pointer; var AMessage): PtrInt;
// PChar
function CreatePChar(const s: string): PChar;

8
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -2822,9 +2822,9 @@ var
theRect : TRect;
Lines : PPChar;
I, NumLines : Longint;
TempDC,
TempPen,
TempBrush : Longint;
TempDC : HDC;
TempPen : HPEN;
TempBrush : HBRUSH;
Function LeftOffset : Longint;
begin
@ -5553,7 +5553,7 @@ end;
------------------------------------------------------------------------------}
function TGtkWidgetSet.GetStockObject(Value: Integer): LongInt;
function TGtkWidgetSet.GetStockObject(Value: Integer): THandle;
begin
Assert(False, Format('Trace:> [TGtkWidgetSet.GetStockObject] %d', [Value]));
Result := 0;

2
lcl/interfaces/gtk/gtkwinapih.inc
View File

@ -119,7 +119,7 @@ function GetROP2(DC: HDC): Integer; override;
function GetScrollBarSize(Handle: HWND; BarKind: Integer): integer; override;
function GetScrollbarVisible(Handle: HWND; SBStyle: Integer): boolean; override;
function GetScrollInfo(Handle: HWND; SBStyle: Integer; var ScrollInfo: TScrollInfo): Boolean; override;
function GetStockObject(Value: Integer): LongInt; override;
function GetStockObject(Value: Integer): THandle; override;
function GetSysColor(nIndex: Integer): DWORD; override;
function GetSystemMetrics(nIndex: Integer): Integer; override;
function GetTextColor(DC: HDC) : TColorRef; Override;

2
lcl/interfaces/win32/win32winapi.inc
View File

@ -1991,7 +1991,7 @@ End;
Retrieves a handle to one of the predefined stock objects.
------------------------------------------------------------------------------}
Function TWin32WidgetSet.GetStockObject(Value: Integer): LongInt;
Function TWin32WidgetSet.GetStockObject(Value: Integer): THandle;
Begin
Assert(False, Format('Trace:> [TWin32WidgetSet.GetStockObject] %d ', [Value]));
Result := Windows.GetStockObject(Value);

2
lcl/interfaces/win32/win32winapih.inc
View File

@ -113,7 +113,7 @@ function GetParent(Handle: HWND): HWND; Override;
function GetProp(Handle: HWND; Str: PChar): Pointer; Override;
function GetROP2(DC: HDC): Integer; override;
function GetScrollInfo(Handle: HWND; BarFlag: Integer; Var ScrollInfo: TScrollInfo): Boolean; Override;
function GetStockObject(Value: Integer): LongInt; Override;
function GetStockObject(Value: Integer): THandle; Override;
function GetSysColor(NIndex: Integer): DWORD; Override;
function GetSystemMetrics(NIndex: Integer): Integer; Override;
function GetTextColor(DC: HDC): TColorRef; Override;

6
lcl/lcltype.pp
View File

@ -109,9 +109,9 @@ type
Bool = LongBool;
Short = SmallInt;
WPARAM = type PtrInt; //LongInt;
LPARAM = type PtrInt; //LongInt;
LRESULT = type PtrInt; //LongInt;
WPARAM = type PtrInt; //LongInt or Int64 on CPU64;
LPARAM = type PtrInt; //LongInt or Int64 on CPU64;
LRESULT = type PtrInt; //LongInt or Int64 on CPU64;
ULONG_PTR = type PtrUInt;