summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-03-20 14:38:59 -0400
committerMatthias Clasen <mclasen@redhat.com>2013-05-05 15:38:47 -0400
commit8470eb84c080718120b5daf130db744bf6ec220b (patch)
treeef136d11dfb6f6e2c7fbf1a068631357d632be64
parent28fb54256b71041fdb32ce6b0e5eced2459833f1 (diff)
downloadgtk+-8470eb84c080718120b5daf130db744bf6ec220b.tar.gz
gtk: Use GDK_AVAILABLE_IN_ALL for generated enum types
glib-mkenums is not currently clever enough to know which version an enum type was added in, so just mark all the _get_type() functions as available in all versions.
-rw-r--r--gtk/gtkprivatetypebuiltins.c.template1
-rw-r--r--gtk/gtkprivatetypebuiltins.h.template1
-rw-r--r--gtk/gtktypebuiltins.c.template1
-rw-r--r--gtk/gtktypebuiltins.h.template3
4 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template
index b8db5a4385..db65d1efd6 100644
--- a/gtk/gtkprivatetypebuiltins.c.template
+++ b/gtk/gtkprivatetypebuiltins.c.template
@@ -1,4 +1,5 @@
/*** BEGIN file-header ***/
+#include "config.h"
#include "gtk.h"
#include "gtkprivate.h"
#include "gtkprivatetypebuiltins.h"
diff --git a/gtk/gtkprivatetypebuiltins.h.template b/gtk/gtkprivatetypebuiltins.h.template
index c3618edc5e..a21e9aac05 100644
--- a/gtk/gtkprivatetypebuiltins.h.template
+++ b/gtk/gtkprivatetypebuiltins.h.template
@@ -7,6 +7,7 @@
#define __GTK_PRIVATE_TYPE_BUILTINS_H__
#include <glib-object.h>
+#include <gdk/gdk.h>
G_BEGIN_DECLS
/*** END file-header ***/
diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index 828d6d1b13..fbd21db368 100644
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -1,4 +1,5 @@
/*** BEGIN file-header ***/
+#include "config.h"
#include "gtk.h"
#include "gtkprivate.h"
diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template
index ae41837486..ac2477703c 100644
--- a/gtk/gtktypebuiltins.h.template
+++ b/gtk/gtktypebuiltins.h.template
@@ -7,6 +7,7 @@
#define __GTK_TYPE_BUILTINS_H__
#include <glib-object.h>
+#include <gdk/gdk.h>
G_BEGIN_DECLS
/*** END file-header ***/
@@ -17,7 +18,7 @@ G_BEGIN_DECLS
/*** END file-production ***/
/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
/*** END value-header ***/