paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-09 20:47:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds support to FPC 2.2.0 for Windows CE

Browse Source 
git-svn-id: trunk@25090 -
This commit is contained in:
sekelsenmat 2010-05-01 10:59:17 +00:00
parent eea3b2aca9
commit 4ec26a9c40
18 changed files with 55 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/dbgrids.pas
View File

@ -1047,6 +1047,7 @@ begin
StartUpdating;
edField.Text := FTempText;
{$ifndef ver2_2_0}
if edField.Lookup and edField.LookupCache then begin
{$WARNINGS OFF}
lst := TLookupListCracker(edField.LookupList).FList;
@ -1059,6 +1060,7 @@ begin
end;
end;
end;
{$endif}
EndUpdating;
EditingColumn(FEditingColumn, False);
@ -3322,6 +3324,7 @@ var
p: PLookupListRec;
begin
Result := inherited GetPickList;
{$ifndef ver2_2_0}
if (Field<>nil) and Field.Lookup and Field.LookupCache then begin
Result.Clear;
{$WARNINGS OFF}
@ -3332,6 +3335,7 @@ begin
Result.AddObject(p^.Value, TObject(p));
end;
end;
{$endif}
end;
procedure TColumn.ApplyDisplayFormat;

4
lcl/forms.pp
View File

@ -1714,8 +1714,10 @@ begin
if Keys and MK_LButton <> 0 then Include(Result, ssLeft);
if Keys and MK_RButton <> 0 then Include(Result, ssRight);
if Keys and MK_MButton <> 0 then Include(Result, ssMiddle);
{$ifndef ver2_2_0}
if Keys and MK_XBUTTON1 <> 0 then Include(Result, ssExtra1);
if Keys and MK_XBUTTON2 <> 0 then Include(Result, ssExtra2);
{$endif}
if GetKeyState(VK_MENU) < 0 then Include(Result, ssAlt);
if (GetKeyState(VK_LWIN) < 0) or (GetKeyState(VK_RWIN) < 0) then Include(Result, ssMeta);
end;
@ -1733,8 +1735,10 @@ begin
if ssLeft in ShiftState then Result := Result or MK_LBUTTON;
if ssRight in ShiftState then Result := Result or MK_RBUTTON;
if ssMiddle in ShiftState then Result := Result or MK_MBUTTON;
{$ifndef ver2_2_0}
if ssExtra1 in ShiftState then Result := Result or MK_XBUTTON1;
if ssExtra2 in ShiftState then Result := Result or MK_XBUTTON2;
{$endif}
end;
function WindowStateToStr(const State: TWindowState): string;

2
lcl/imglist.pp
View File

@ -158,7 +158,7 @@ type
procedure WriteData(AStream: TStream); virtual;
procedure ReadData(AStream: TStream); virtual;
function Equals(Obj: TObject): boolean;
{$ifndef ver2_2_2}{$IF FPC_FULLVERSION>20500}override;{$ENDIF}{$ENDIF}
{$if not (defined(ver2_2_2) or defined(ver2_2_0))}{$IF FPC_FULLVERSION>20500}override;{$ENDIF}{$ENDIF}
procedure BeginUpdate;
procedure EndUpdate;

2
lcl/include/imglist.inc
View File

@ -1198,7 +1198,7 @@ begin
CurStream.Free;
end;
end else
{$ifndef ver2_2_2}
{$if not (defined(ver2_2_2) or defined(ver2_2_0))}
{$IF FPC_FULLVERSION>20500}
Result:=inherited Equals(Obj);
{$ELSE}

4
lcl/interfaces/wince/winceint.pp
View File

@ -32,7 +32,7 @@ interface
FPC 2.0 or inferior isn't checked because it can't compile for wince }
{$ifdef CPUARM}
{$if defined(ver2_2) and (fpc_patch<1)}
{$fatal The Lazarus WinCE Interface in Lazarus 0.9.25+ requires at least FPC 2.2.1}
// {$fatal The Lazarus WinCE Interface in Lazarus 0.9.25+ requires at least FPC 2.2.1}
{$endif}
{$endif}
@ -53,7 +53,7 @@ uses
{$ifdef Win32}
win32compat,
{$else}
aygshell,
{$ifndef ver2_2_0}aygshell,{$endif}
{$endif}
// Libs
Windows,

2
lcl/interfaces/wince/wincememostrings.inc
View File

@ -111,7 +111,9 @@ begin
QuoteChar := S.QuoteChar;
Delimiter := S.Delimiter;
NameValueSeparator := S.NameValueSeparator;
{$ifndef ver2_2_0}
TextLineBreakStyle := S.TextLineBreakStyle;
{$endif}
Text := S.Text;
end
else

2
lcl/interfaces/wince/winceproc.pp
View File

@ -10,7 +10,7 @@ uses
{$ifdef win32}
win32compat,
{$else}
oleauto, aygshell,
{$ifndef ver2_2_0}oleauto, aygshell,{$endif}
{$endif}
// compatibility
// RTL, LCL

9
lcl/interfaces/wince/wincewscalendar.pp
View File

@ -27,8 +27,13 @@ unit WinCEWSCalendar;
interface
uses
Calendar, SysUtils, Controls, LCLType, commctrl,WSProc,
WSCalendar, WSLCLClasses, Windows, WinCEDef, WinCEWSControls;
// Libs
{$ifndef ver2_2_0}commctrl,{$endif}
Windows,
// LCL
Calendar, SysUtils, Controls, LCLType,
// Widgetset
WSProc, WSCalendar, WSLCLClasses, WinCEDef, WinCEWSControls;
type

3
lcl/interfaces/wince/wincewscomctrls.pp
View File

@ -26,7 +26,8 @@ interface
uses
// RTL, FCL
Windows, Classes, SysUtils, commctrl, WinExt,
Windows, Classes, SysUtils, WinExt,
{$ifndef ver2_2_0}commctrl,{$endif}
// Compatibility
{$ifdef Win32}win32compat,{$endif}
// LCL

3
lcl/interfaces/wince/wincewscontrols.pp
View File

@ -28,7 +28,8 @@ interface
uses
// Libs
Windows, commctrl,
Windows,
{$ifndef ver2_2_0}commctrl,{$endif}
// RTL, LCL
Classes, LCLProc,
LCLType, Controls, Forms, Graphics,

3
lcl/interfaces/wince/wincewsextctrls.pp
View File

@ -27,7 +27,8 @@ interface
uses
// RTL, FCL
Windows, SysUtils, commctrl,
Windows, SysUtils,
{$ifndef ver2_2_0}commctrl,{$endif}
// Compatibility
{$ifdef Win32}win32compat,{$endif}
// LCL

3
lcl/interfaces/wince/wincewsimglist.pp
View File

@ -28,7 +28,8 @@ interface
uses
// Libs
Windows, commctrl,
Windows,
{$ifndef ver2_2_0}commctrl,{$endif}
// RTL, LCL
SysUtils, Classes, ImgList, GraphType, Graphics, LCLType,
// Widgetset

9
lcl/interfaces/wince/wincewsmenus.pp
View File

@ -30,8 +30,9 @@ uses
Graphics, GraphType, ImgList, Menus, Forms, LCLIntf, {keep before Windows }
Controls, InterfaceBase, LCLProc,
// RTL, FCL
Windows, Classes, SysUtils, commctrl,
{$ifndef win32}aygshell,{$endif}
Windows, Classes, SysUtils,
{$ifndef ver2_2_0}commctrl,
{$ifndef win32}aygshell,{$endif}{$endif}
// widgetset
WinceInt, WinceProc, WinCEWSImgList,
WSMenus, WSLCLClasses;
@ -101,7 +102,11 @@ implementation
uses strutils;
{$ifndef ver2_2_0}
{$R wincemenures.rc}
{$else}
{$R wincemenures.res}
{$endif}
{ helper routines }

17
lcl/interfaces/wince/wincewsspin.pp
View File

@ -26,16 +26,13 @@ unit WinCEWSSpin;
interface
uses
////////////////////////////////////////////////////
// I M P O R T A N T
////////////////////////////////////////////////////
// To get as little as posible circles,
// uncomment only when needed for registration
////////////////////////////////////////////////////
Spin, Controls, StdCtrls, LCLType, commctrl,
LCLProc,
////////////////////////////////////////////////////
WSSpin, WSLCLClasses, Windows, WinCEInt, WinCEProc,
// Libs
{$ifndef ver2_2_0}commctrl,{$endif}
Windows,
// LCL
Spin, Controls, StdCtrls, LCLType, LCLProc,
// Widgetset
WSSpin, WSLCLClasses, WinCEInt, WinCEProc,
WinCEWSStdCtrls, WinCEWSControls;
type

2
lcl/interfaces/wince/wincewsstdctrls.pp
View File

@ -29,7 +29,7 @@ interface
uses
// Libs
Windows,
{$ifndef win32}oleauto,{$endif}
{$ifndef ver2_2_0}{$ifndef win32}oleauto,{$endif}{$endif}
// Compatibility
{$ifdef Win32}win32compat,{$endif}
// RTL, FCL, LCL

6
lcl/lcltype.pp
View File

@ -60,12 +60,16 @@ uses
{$define extdecl := stdcall}
{$endif}
// Types for FPC 2.2.4 support for WinCE
// Types for FPC 2.2.x support for WinCE
{$ifdef ver2_2}
type
TFPResourceHandle = THandle;
TFPResourceHGlobal = THandle;
{$endif}
{$ifdef ver2_2_0}
const
AllFilesMask = '*.*';
{$endif}
type
{$IFDEF USE_UTF8BIDI_LCL}

4
lcl/lresources.pp
View File

@ -5343,7 +5343,11 @@ begin
if ascii then
fToken:=Classes.toString
else
{$ifdef ver2_2_0}
fToken:=Classes.toString
{$else}
fToken:=toWString;
{$endif}
end;
procedure TUTF8Parser.HandleMinus;

2
lcl/shellctrls.pas
View File

@ -26,7 +26,7 @@ unit ShellCtrls;
interface
uses
Classes, SysUtils, Forms, Graphics,
Classes, SysUtils, Forms, Graphics, LCLType,
ComCtrls, FileUtil;
type