paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 03:00:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32 interface: fixed compilation with fpc 2.2.0 and 2.3.1

Browse Source 
git-svn-id: trunk@14134 -
This commit is contained in:
vincents 2008-02-14 13:20:14 +00:00
parent 0167c70d4d
commit a630267f5b
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,11 @@ begin
end;
function TWin32MemoStrings.GetTextStr: string;
{$ifndef WindowsUnicodeSupport}
var
CapLen: dword;
Caption: PChar;
{$endif}
begin
{$ifdef WindowsUnicodeSupport}
Result := win32proc.GetControlText(fHandle);

2
lcl/interfaces/win32/win32wsbuttons.pp
View File

@ -33,7 +33,7 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, Classes, Buttons, Graphics, GraphType, Controls,
CommCtrl, Windows, Classes, Buttons, Graphics, GraphType, Controls,
////////////////////////////////////////////////////
WSProc, WSControls, WSButtons, WSLCLClasses,
Win32WSControls, Win32WSImgList, LCLType, Themes;

2
lcl/interfaces/win32/win32wscontrols.pp
View File

@ -33,7 +33,7 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, Classes, Controls, Graphics,
CommCtrl, Windows, Classes, Controls, Graphics,
////////////////////////////////////////////////////
WSControls, WSLCLClasses, SysUtils, Win32Proc, Win32Extra, WSProc,
{ TODO: needs to move }

9
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -35,6 +35,9 @@ uses
////////////////////////////////////////////////////
// rtl
Windows, ShellApi, ActiveX, SysUtils, Classes,
{$IFNDEF VER2_2}
commdlg,
{$ENDIF}
// lcl
LCLProc, LCLType, Dialogs, Controls, Graphics, Forms,
// ws
@ -755,7 +758,11 @@ begin
begin
LStructSize := sizeof(TChooseFont);
HWndOwner := GetOwnerHandle(ACommonDialog);
LPLogFont := Windows.LPLOGFONT(@LF);
{$ifndef ver2_2}
LPLogFont := commdlg.PLOGFONT(@LF);
{$else}
LPLogFont := windows.PLOGFONT(@LF);
{$endif}
Flags := GetFlagsFromOptions(Options);
Flags := Flags or CF_INITTOLOGFONTSTRUCT or CF_BOTH;
RGBColors := Font.Color;

2
lcl/interfaces/win32/win32wsimglist.pp
View File

@ -34,7 +34,7 @@ uses
// uncomment only when needed for registration
////////////////////////////////////////////////////
// rtl
Windows, {CommCtrl, }SysUtils, Classes,
CommCtrl, Windows, SysUtils, Classes,
// lcl
ImgList, GraphType, Graphics, LCLType,
// ws

5
lcl/interfaces/win32/win32wsspin.pp
View File

@ -33,10 +33,11 @@ uses
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Windows, CommCtrl, Win32Extra,
Spin, Controls, StdCtrls, LCLType,
////////////////////////////////////////////////////
WSSpin, WSLCLClasses, Windows, Win32Int, Win32Extra, Win32Proc,
Win32WSStdCtrls, Win32WSControls;
WSSpin, WSLCLClasses,
Win32Int, Win32Proc, Win32WSStdCtrls, Win32WSControls;
type