Remove all deprecated stuff from gtkmain

[~andy/gtk] / gtk / gtkmain.h

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 680ae2844eac3ff0009e66e22fb5c16cc5aefced..13f0fcb44a0de535d7e3a3489cbe880d183d4c4a 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -45,20 +45,6 @@ G_BEGIN_DECLS
  */
 #define GTK_PRIORITY_RESIZE     (G_PRIORITY_HIGH_IDLE + 10)
 
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* Use GDK_PRIORITY_REDRAW */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
-
-/* Deprecated. Use G_PRIORITY #define's instead
- */
-#define GTK_PRIORITY_HIGH       G_PRIORITY_HIGH
-#define GTK_PRIORITY_INTERNAL   GTK_PRIORITY_REDRAW
-#define GTK_PRIORITY_DEFAULT   G_PRIORITY_DEFAULT_IDLE
-#define GTK_PRIORITY_LOW       G_PRIORITY_LOW
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
 typedef gint   (*GtkKeySnoopFunc)          (GtkWidget    *grab_widget,
                                             GdkEventKey  *event,
                                             gpointer      func_data);
@@ -127,10 +113,6 @@ gboolean gtk_init_check_abi_check (int       *argc,
 
 #endif
 
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_exit                 (gint    error_code);
-#endif /* GTK_DISABLE_DEPRECATED */
-
 void           gtk_disable_setlocale    (void);
 gchar *        gtk_set_locale           (void);
 PangoLanguage *gtk_get_default_language (void);
@@ -170,37 +152,6 @@ 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);
-#ifndef GTK_DISABLE_DEPRECATED
-guint     gtk_timeout_add         (guint32            interval,
-                                   GtkFunction        function,
-                                   gpointer           data);
-guint     gtk_timeout_add_full    (guint32            interval,
-                                   GtkFunction        function,
-                                   GtkCallbackMarshal marshal,
-                                   gpointer           data,
-                                   GDestroyNotify     destroy);
-void      gtk_timeout_remove      (guint              timeout_handler_id);
-
-guint     gtk_idle_add            (GtkFunction        function,
-                                   gpointer           data);
-guint     gtk_idle_add_priority   (gint               priority,
-                                   GtkFunction        function,
-                                   gpointer           data);
-guint     gtk_idle_add_full       (gint               priority,
-                                   GtkFunction        function,
-                                   GtkCallbackMarshal marshal,
-                                   gpointer           data,
-                                   GDestroyNotify     destroy);
-void      gtk_idle_remove         (guint              idle_handler_id);
-void      gtk_idle_remove_by_data (gpointer           data);
-guint     gtk_input_add_full      (gint               source,
-                                   GdkInputCondition  condition,
-                                   GdkInputFunction   function,
-                                   GtkCallbackMarshal marshal,
-                                   gpointer           data,
-                                   GDestroyNotify     destroy);
-void      gtk_input_remove        (guint              input_handler_id);
-#endif /* GTK_DISABLE_DEPRECATED */
 
 guint     gtk_key_snooper_install (GtkKeySnoopFunc snooper,
                                    gpointer        func_data);