paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 13:40:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gtk1-fix-debug-build' into 'main'

Browse Source 
LCL-GTK1: Fix debug build with trunk Lazarus and FPC

See merge request freepascal.org/lazarus/lazarus!236
This commit is contained in:
Maxim Ganetsky 2023-09-27 18:11:57 +00:00
commit e9661699a3
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,7 @@ begin
XGetWindowProperty(XDisplay, XWindow, _NET_WM_STATE,
0, MaxInt, False, XA_ATOM, @atomtype, @format, @nitems,
@bytes_after, @state_array);
@bytes_after, gpointer(@state_array));
if (atomtype = XA_ATOM) and (format = 32) and (nitems > 0) then
begin
// Check to see if the window is already minimized...

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

@ -494,7 +494,7 @@ begin
then begin
// screen: ToDo: multiple desktops
{$ifdef gtk1}
FDrawable := @gdk_root_parent;
FDrawable := PGDKDrawable(@gdk_root_parent);
{$else}
FDrawable := gdk_screen_get_root_window(gdk_screen_get_default);
{$endif}

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

@ -53,7 +53,7 @@ const
);
var
PixmapArray: array[1..3] of PPgchar =
PixmapArray: array[1..3] of Pointer =
(
{1 - MDIMINBUTTON}
@XPM_MDIMINBUTTON,

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

@ -2363,7 +2363,7 @@ var
end;
var
Width, Height, H, W, D: cardinal;
Width, Height, H, W, D: gint;
Image: PGdkImage;
R: TRect;
begin

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

@ -2043,8 +2043,8 @@ begin
GetColorMask(Img, Msk, @ImgBits[0], @MskBits[0], W, H);
srcbitmap := gdk_bitmap_create_from_data(nil, @ImgBits[0], W, H);
mskbitmap := gdk_bitmap_create_from_data(nil, @MskBits[0], W, H);
srcbitmap := gdk_bitmap_create_from_data(nil, Pgchar(@ImgBits[0]), W, H);
mskbitmap := gdk_bitmap_create_from_data(nil, Pgchar(@MskBits[0]), W, H);
// white
fg.red := $FFFF;