From 9e95d1204b9a05638e912d98ea3d1abf5faa35fd Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 20 Aug 2008 14:11:05 +0200 Subject: FPC 2.2.2 compatibility --- libgtk_kylix/GTKStdCtrls.pas | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libgtk_kylix') diff --git a/libgtk_kylix/GTKStdCtrls.pas b/libgtk_kylix/GTKStdCtrls.pas index 1d4157a..f2a2ec2 100644 --- a/libgtk_kylix/GTKStdCtrls.pas +++ b/libgtk_kylix/GTKStdCtrls.pas @@ -421,11 +421,10 @@ begin end; function TGTKMisc.GetXPadding: integer; -var xpad, ypad: pgint; +var xpad, ypad: gint; begin - gtk_misc_get_padding(PGtkMisc(FWidget), xpad, ypad); - if Assigned(xpad) then Result := Integer(xpad) - else Result := 0; + gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); + Result := xpad; end; procedure TGTKMisc.SetXPadding(Value: integer); @@ -434,11 +433,10 @@ begin end; function TGTKMisc.GetYPadding: integer; -var xpad, ypad: pgint; +var xpad, ypad: gint; begin - gtk_misc_get_padding(PGtkMisc(FWidget), xpad, ypad); - if Assigned(ypad) then Result := Integer(ypad) - else Result := 0; + gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); + Result := ypad; end; procedure TGTKMisc.SetYPadding(Value: integer); -- cgit v1.2.3 From 4c57ea157b3ee4b9d9b9716c27a538540b73fcd9 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 21 Aug 2008 17:53:01 +0200 Subject: FPC Compatibility fixes --- libgtk_kylix/GTKStdCtrls.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libgtk_kylix') diff --git a/libgtk_kylix/GTKStdCtrls.pas b/libgtk_kylix/GTKStdCtrls.pas index f2a2ec2..1cccdf8 100644 --- a/libgtk_kylix/GTKStdCtrls.pas +++ b/libgtk_kylix/GTKStdCtrls.pas @@ -420,10 +420,12 @@ begin gtk_misc_set_padding(PGtkMisc(FWidget), XPadding, YPadding); end; +procedure x_gtk_misc_get_padding(misc:PGtkMisc; xpad:Pgint; ypad:Pgint); cdecl; external gtklib name 'gtk_misc_get_padding'; + function TGTKMisc.GetXPadding: integer; var xpad, ypad: gint; begin - gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); + x_gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); Result := xpad; end; @@ -435,7 +437,7 @@ end; function TGTKMisc.GetYPadding: integer; var xpad, ypad: gint; begin - gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); + x_gtk_misc_get_padding(PGtkMisc(FWidget), @xpad, @ypad); Result := ypad; end; -- cgit v1.2.3