summaryrefslogtreecommitdiff
path: root/gtk/gtkoptionmenu.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-03-20 07:01:23 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-03-20 07:01:23 +0000
commitcca8dd63475ab582d8592039f1f69d7f22a3b928 (patch)
treef800dcc62e1ab8a0010e774a05e669b14c3ff5e1 /gtk/gtkoptionmenu.c
parentb39b0bfc0471258285169113bc176320b0b5ae71 (diff)
downloadgdk-pixbuf-cca8dd63475ab582d8592039f1f69d7f22a3b928.tar.gz
Make PLT-reduction work with gcc4, and don't include everything in
2005-03-20 Matthias Clasen <mclasen@redhat.com> Make PLT-reduction work with gcc4, and don't include everything in gdkalias.h: * gtk/grk.symbols: Group symbols by header and source file. * gtk/makegtkalias.pl: Protect definitions by the same preprocessor symbols used to guard the headers. Move the alias declarations to a separate file which is produced when calling makegtkalias.pl -def * gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate this file. * gtk/*.c: Include gtkalias.h after the other headers, include gtkaliasdef.c at the bottom. * gtk/*.h: Small cleanups.
Diffstat (limited to 'gtk/gtkoptionmenu.c')
-rw-r--r--gtk/gtkoptionmenu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 9791a7ff5..fb4dd65a4 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -25,7 +25,6 @@
*/
#include <config.h>
-#include "gtkalias.h"
#include "gtkintl.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"
@@ -36,6 +35,8 @@
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
+#include "gtkalias.h"
+
#define CHILD_LEFT_SPACING 4
#define CHILD_RIGHT_SPACING 1
#define CHILD_TOP_SPACING 1
@@ -1061,3 +1062,6 @@ gtk_option_menu_scroll_event (GtkWidget *widget,
return TRUE;
}
+#define __GTK_OPTION_MENU_C__
+#include "gtkaliasdef.c"
+