Don't use zip -r on the etc directory, to avoid including editor backup

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

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 5701588ea7085ed39d83650f981f6a7c6b6e0b78..a159aff0a3c9c02b60b247e6024bba07c1b4c417 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -30,7 +30,10 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
-
+#ifdef G_PLATFORM_WIN32
+#include <gtk/gtkbox.h>
+#include <gtk/gtkwindow.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,9 +41,13 @@ extern "C" {
 
 /* Priorities for redrawing and resizing
  */
-#define GTK_PRIORITY_REDRAW     (G_PRIORITY_HIGH_IDLE + 20)
 #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
@@ -48,15 +55,18 @@ extern "C" {
 #define GTK_PRIORITY_DEFAULT   G_PRIORITY_DEFAULT_IDLE
 #define GTK_PRIORITY_LOW       G_PRIORITY_LOW
 
-typedef void   (*GtkModuleInitFunc)    (gint           *argc,
-                                        gchar        ***argv);
-typedef gint   (*GtkKeySnoopFunc)      (GtkWidget      *grab_widget,
-                                        GdkEventKey    *event,
-                                        gpointer        func_data);
+#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);
 
 /* Gtk version.
  */
-#ifdef G_OS_WIN32
+#ifdef G_PLATFORM_WIN32
 #ifdef GTK_COMPILATION
 #define GTKMAIN_C_VAR __declspec(dllexport)
 #else
@@ -84,7 +94,7 @@ void     gtk_init                 (int    *argc,
 
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
-#ifdef G_OS_WIN32
+#ifdef G_PLATFORM_WIN32
 
 /* Variants that are used to check for correct struct packing
  * when building GTK+-using code.
@@ -92,41 +102,43 @@ gboolean gtk_init_check           (int    *argc,
 void    gtk_init_abi_check       (int    *argc,
                                   char ***argv,
                                   int     num_checks,
-                                  size_t  sizeof_GtkWindow);
+                                  size_t  sizeof_GtkWindow,
+                                  size_t  sizeof_GtkBox);
 gboolean gtk_init_check_abi_check (int   *argc,
                                   char ***argv,
                                   int     num_checks,
-                                  size_t  sizeof_GtkWindow);
+                                  size_t  sizeof_GtkWindow,
+                                  size_t  sizeof_GtkBox);
 
-#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 1, sizeof (GtkWindow))
-#define gtk_init_check(args, argv) gtk_init_check_abi_check (argc, argv, 1, sizeof (GtkWindow))
+#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
+#define gtk_init_check(argc, argv) gtk_init_check_abi_check (argc, argv, 2, sizeof (GtkWindow), sizeof (GtkBox))
 
 #endif
 
 #ifndef GTK_DISABLE_DEPRECATED
 void     gtk_exit                 (gint    error_code);
 #endif /* GTK_DISABLE_DEPRECATED */
-gchar*   gtk_set_locale           (void);
-gchar*   gtk_get_default_language (void);
-gint     gtk_events_pending       (void);
-
 
+void           gtk_disable_setlocale    (void);
+gchar *        gtk_set_locale           (void);
+PangoLanguage *gtk_get_default_language (void);
+gint           gtk_events_pending       (void);
 
 /* The following is the event func GTK+ registers with GDK
  * we expose it mainly to allow filtering of events between
  * GDK and GTK+.
  */
-void  gtk_main_do_event          (GdkEvent           *event);
+void      gtk_main_do_event       (GdkEvent           *event);
 
-void      gtk_main              (void);
-guint     gtk_main_level        (void);
-void      gtk_main_quit         (void);
-gint      gtk_main_iteration    (void);
+void      gtk_main                (void);
+guint     gtk_main_level          (void);
+void      gtk_main_quit           (void);
+gboolean   gtk_main_iteration     (void);
 /* gtk_main_iteration() calls gtk_main_iteration_do(TRUE) */
-gint      gtk_main_iteration_do (gboolean blocking);
+gboolean   gtk_main_iteration_do   (gboolean blocking);
 
-gint      gtk_true                (void) G_GNUC_CONST;
-gint      gtk_false               (void) G_GNUC_CONST;
+gboolean   gtk_true               (void) G_GNUC_CONST;
+gboolean   gtk_false              (void) G_GNUC_CONST;
 
 void      gtk_grab_add            (GtkWidget          *widget);
 GtkWidget* gtk_grab_get_current           (void);
@@ -146,6 +158,7 @@ guint          gtk_quit_add_full       (guint              main_level,
                                    GtkDestroyNotify   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);
@@ -175,7 +188,7 @@ guint          gtk_input_add_full      (gint               source,
                                    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);
@@ -193,6 +206,17 @@ GtkWidget* gtk_get_event_widget       (GdkEvent       *event);
 void       gtk_propagate_event     (GtkWidget         *widget,
                                    GdkEvent          *event);
 
+gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
+                                   GValue                *return_accu,
+                                   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 */