diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-04-27 09:21:47 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-04-27 09:21:47 +0000 |
| commit | 6830f6782e4bb7f55104caedfd6d10b52398344c (patch) | |
| tree | ad65e63ce2554c23d5fac23577ca4373f71a8882 | |
| parent | 9a7586791d8b3dad08c0ec46f272197263a4e170 (diff) | |
| download | fpGUI-6830f6782e4bb7f55104caedfd6d10b52398344c.tar.xz | |
Provisional changes for FPC 2.3.x support
| -rw-r--r-- | src/corelib/gfx_imgfmt_bmp.pas | 2 | ||||
| -rw-r--r-- | src/corelib/x11/_netlayer.pas | 8 | ||||
| -rw-r--r-- | src/corelib/x11/gfx_x11.pas | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/gfx_imgfmt_bmp.pas b/src/corelib/gfx_imgfmt_bmp.pas index 3748d5c7..54d4bfd3 100644 --- a/src/corelib/gfx_imgfmt_bmp.pas +++ b/src/corelib/gfx_imgfmt_bmp.pas @@ -12,7 +12,7 @@ uses Classes, SysUtils, fpgfx, - gfxbase, fpcanvas; + gfxbase{, fpcanvas}; procedure ReadImage_BMP(img: TfpgImage; bmp: Pointer; bmpsize: longword); function LoadImage_BMP(const AFileName: string): TfpgImage; diff --git a/src/corelib/x11/_netlayer.pas b/src/corelib/x11/_netlayer.pas index 31ea9d92..ab07c10a 100644 --- a/src/corelib/x11/_netlayer.pas +++ b/src/corelib/x11/_netlayer.pas @@ -667,7 +667,7 @@ var bytes_after: culong; begin Result := False; - XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, False, XA_ATOM, @atomtype, @format, @nitems, + XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, TBool(False), XA_ATOM, @atomtype, @format, @nitems, @bytes_after, @Atoms); if (atomtype = XA_ATOM) and (format = 32) then begin @@ -734,7 +734,7 @@ var bytes_after: culong; begin Result := False; - XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, False, XA_ATOM, @atomtype, @format, @nitems, + XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, TBool(False), XA_ATOM, @atomtype, @format, @nitems, @bytes_after, @Windows); if (atomtype = XA_WINDOW) and (format = 32) then begin @@ -760,7 +760,7 @@ var Utf8Str: PChar; begin Result := False; - XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, False, XA_ATOM, @atomtype, @format, @nitems, + XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, TBool(False), XA_ATOM, @atomtype, @format, @nitems, @bytes_after, @Utf8Str); if (atomtype = XA_WINDOW) and (format = 32) then begin @@ -786,7 +786,7 @@ var bytes_after: culong; begin Result := False; - XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, False, XA_ATOM, @atomtype, @format, @nitems, + XGetWindowProperty (FDisplay, AWindow, AProperty, 0, MaxInt, TBool(False), XA_ATOM, @atomtype, @format, @nitems, @bytes_after, @Cards); if (atomtype = XA_CARDINAL) and (format = 32) then begin diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas index 938a12cb..cb29ffaf 100644 --- a/src/corelib/x11/gfx_x11.pas +++ b/src/corelib/x11/gfx_x11.pas @@ -487,7 +487,7 @@ begin begin XGetWindowProperty(xapplication.Display, ev.xselection.requestor, ev.xselection._property, 0, 16000, - false, // delete + TBool(false), // delete 0, // type @actual, @format, @count, @remaining, @data); @@ -1323,7 +1323,7 @@ begin mask := 0; if FWindowType in [wtPopup] then begin - attr.Override_Redirect := longbool(1); + attr.Override_Redirect := TBool(True); mask := CWOverrideRedirect; end; @@ -1605,7 +1605,7 @@ end; procedure TfpgWindowImpl.CaptureMouse; begin XGrabPointer(xapplication.Display, FWinHandle, - False, + TBool(False), ButtonPressMask or ButtonReleaseMask or ButtonMotionMask or PointerMotionMask, GrabModeAsync, GrabModeAsync, |