Modify the gettext translation domain for the gtk3 rename

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

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index d4cfc0c21273a0d7168e51b643475222522e02b0..13f0fcb44a0de535d7e3a3489cbe880d183d4c4a 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_MAIN_H__
 #define __GTK_MAIN_H__
 
@@ -35,31 +39,12 @@
 #include <gtk/gtkwindow.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Priorities for redrawing and resizing
  */
 #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 void   (*GtkModuleInitFunc)        (gint         *argc,
-                                            gchar      ***argv);
-typedef void   (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
 typedef gint   (*GtkKeySnoopFunc)          (GtkWidget    *grab_widget,
                                             GdkEventKey  *event,
                                             gpointer      func_data);
@@ -81,22 +66,32 @@ GTKMAIN_C_VAR const guint gtk_minor_version;
 GTKMAIN_C_VAR const guint gtk_micro_version;
 GTKMAIN_C_VAR const guint gtk_binary_age;
 GTKMAIN_C_VAR const guint gtk_interface_age;
-gchar* gtk_check_version (guint        required_major,
-                         guint required_minor,
-                         guint required_micro);
+const gchar* gtk_check_version (guint  required_major,
+                               guint   required_minor,
+                               guint   required_micro);
 
 
 /* Initialization, exit, mainloop and miscellaneous routines
  */
 
 gboolean gtk_parse_args           (int    *argc,
-                                  char ***argv)
+                                  char ***argv);
 
 void     gtk_init                 (int    *argc,
                                    char ***argv);
 
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
+  
+gboolean gtk_init_with_args       (int            *argc,
+                                  char         ***argv,
+                                  const char     *parameter_string,
+                                  GOptionEntry   *entries,
+                                  const char     *translation_domain,
+                                  GError        **error);
+
+GOptionGroup *gtk_get_option_group (gboolean open_default_display);
+  
 #ifdef G_PLATFORM_WIN32
 
 /* Variants that are used to check for correct struct packing
@@ -118,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);
@@ -158,40 +149,9 @@ guint         gtk_quit_add_full       (guint              main_level,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   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,
-                                   GtkDestroyNotify   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,
-                                   GtkDestroyNotify   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,
-                                   GtkDestroyNotify   destroy);
-void      gtk_input_remove        (guint              input_handler_id);
-#endif /* GTK_DISABLE_DEPRECATED */
 
 guint     gtk_key_snooper_install (GtkKeySnoopFunc snooper,
                                    gpointer        func_data);
@@ -214,15 +174,8 @@ gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
                                    const GValue          *handler_return,
                                    gpointer               dummy);
 
-gchar * _gtk_find_module     (const gchar *name,
-                             const gchar *type);
-gchar **_gtk_get_module_path (const gchar *type);
-
 gchar *_gtk_get_lc_ctype (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MAIN_H__ */