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 93a6d4c95f911fe5c993926217836ca72bb110dc..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" {
@@ -54,11 +57,12 @@ extern "C" {
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-typedef void   (*GtkModuleInitFunc)    (gint           *argc,
-                                        gchar        ***argv);
-typedef gint   (*GtkKeySnoopFunc)      (GtkWidget      *grab_widget,
-                                        GdkEventKey    *event,
-                                        gpointer        func_data);
+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.
  */
@@ -98,22 +102,17 @@ 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))
-
-#endif
+#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))
 
-#ifdef G_OS_WIN32
-/* don't hard-code any absolute directory but calculate then from
- * regristy settings or gtk-*.*.dll placement. 
- */
-gchar *get_gtk_win32_directory (gchar *subdir);
 #endif
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -159,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);
@@ -188,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);
@@ -211,6 +211,11 @@ 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
 }