summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-10-15 14:13:32 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-10-15 14:13:32 -0400
commit921fc8807c6a37b94ebb2b5397bf89f0557c718d (patch)
tree4cd3034736f827d207a5decd978a275ae7ca3551 /gtk
parent18578b33c59c2c4c5852cab9cda03f087a28dbc3 (diff)
downloadgtk+-921fc8807c6a37b94ebb2b5397bf89f0557c718d.tar.gz
Deprecate gtk_init_add, gtk_remove_add and friends
This functions are going to be removed in GTK+ 3. https://bugzilla.gnome.org/show_bug.cgi?id=629955
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkmain.c3
-rw-r--r--gtk/gtkmain.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 1dd2adeb5c..42ac35f1ca 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -26,6 +26,8 @@
#include "config.h"
+#include "gtkmain.h"
+
#include <glib.h>
#include "gdkconfig.h"
@@ -52,7 +54,6 @@
#include "gtkclipboard.h"
#include "gtkdnd.h"
#include "gtkversion.h"
-#include "gtkmain.h"
#include "gtkmodules.h"
#include "gtkrc.h"
#include "gtkrecentmanager.h"
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 04b9fd8941..dae07bf4a3 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -142,6 +142,7 @@ void gtk_device_grab_add (GtkWidget *widget,
void gtk_device_grab_remove (GtkWidget *widget,
GdkDevice *device);
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
void gtk_init_add (GtkFunction function,
gpointer data);
void gtk_quit_add_destroy (guint main_level,
@@ -156,6 +157,7 @@ guint gtk_quit_add_full (guint main_level,
GDestroyNotify destroy);
void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data);
+#endif
guint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data);