mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-20 11:09:42 +02:00
This patch is from Ivo Steinmann. It fixes compilation with gtk-2.8
git-svn-id: trunk@4291 -
This commit is contained in:
parent
5bf38351e9
commit
69790fbdc9
@ -18,8 +18,8 @@
|
||||
}
|
||||
unit gtk2; // keep unit name lowercase for kylix
|
||||
|
||||
// default GTK2_6
|
||||
{$define GTK2_6}
|
||||
// default GTK2_8
|
||||
{$define GTK2_8}
|
||||
|
||||
{ Smartlinking has problems on powerpc-linux because of commandline length, disable
|
||||
it for now }
|
||||
@ -55,6 +55,14 @@ unit gtk2; // keep unit name lowercase for kylix
|
||||
{$DEFINE HasGTK2_6}
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF GTK2_8}
|
||||
{$DEFINE HasGTK2_0}
|
||||
{$DEFINE HasGTK2_2}
|
||||
{$DEFINE HasGTK2_4}
|
||||
{$DEFINE HasGTK2_6}
|
||||
{$DEFINE HasGTK2_8}
|
||||
{$ENDIF}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
|
@ -147,7 +147,7 @@
|
||||
|
||||
|
||||
{$ifdef HasGTK2_4}
|
||||
// new GTK 2.4 + 2.6 code
|
||||
// new GTK 2.4 + 2.6 + 2.8 code
|
||||
|
||||
// GtkFileSystem Code for FileChooser
|
||||
{$include gtkfilefilter.inc}
|
||||
@ -155,15 +155,21 @@
|
||||
|
||||
// new GtkFileChooser Widget
|
||||
{$IFDEF HasGTK2_6}
|
||||
{$IFNDEF HasGTK2_8} // These functions are removed from GTK-2.8
|
||||
{$include gtkfilechooserdefault.inc}
|
||||
{$include gtkfilechooserembed.inc}
|
||||
{$include gtkfilechooserentry.inc}
|
||||
{$include gtkiconview.inc}
|
||||
{$ENDIF HasGTK2_8}
|
||||
|
||||
// new GtkCellRendererCombo widget
|
||||
{$include gtkcellrenderercombo.inc}
|
||||
{$ENDIF HasGTK2_6}
|
||||
|
||||
{$IFDEF HasGTK2_8}
|
||||
// Put new GTK-2.8 functions here
|
||||
{$ENDIF HasGTK2_8}
|
||||
|
||||
{$include gtkfilechooser.inc}
|
||||
|
||||
{$include gtkfilechooserprivate.inc}
|
||||
|
Loading…
Reference in New Issue
Block a user