Updated Norwegian bokmål translation.

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

diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 083b0ba98bfac39b914f014a2d92bfeab5f79aae..975057e86484a69b808d4f9ad44352845399edc0 100644 (file)
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -21,26 +21,35 @@
  * 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_DISABLE_SINGLE_INCLUDES) && !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__
 
 
 #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" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* 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,11 +57,11 @@ 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 gint   (*GtkKeySnoopFunc)          (GtkWidget    *grab_widget,
+                                            GdkEventKey  *event,
+                                            gpointer      func_data);
 
 /* Gtk version.
  */
@@ -71,19 +80,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);
+
 void     gtk_init                 (int    *argc,
                                    char ***argv);
 
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
+  
+gboolean gtk_init_with_args       (int            *argc,
+                                  char         ***argv,
+                                  char           *parameter_string,
+                                  GOptionEntry   *entries,
+                                  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
@@ -92,25 +114,27 @@ 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);
+gboolean       gtk_events_pending       (void);
 
 /* The following is the event func GTK+ registers with GDK
  * we expose it mainly to allow filtering of events between
@@ -143,9 +167,10 @@ 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);
@@ -153,7 +178,7 @@ guint          gtk_timeout_add_full    (guint32            interval,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_timeout_remove      (guint              timeout_handler_id);
 
 guint     gtk_idle_add            (GtkFunction        function,
@@ -165,7 +190,7 @@ guint          gtk_idle_add_full       (gint               priority,
                                    GtkFunction        function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   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,
@@ -173,9 +198,9 @@ guint          gtk_input_add_full      (gint               source,
                                    GdkInputFunction   function,
                                    GtkCallbackMarshal marshal,
                                    gpointer           data,
-                                   GtkDestroyNotify   destroy);
+                                   GDestroyNotify     destroy);
 void      gtk_input_remove        (guint              input_handler_id);
-
+#endif /* GTK_DISABLE_DEPRECATED */
 
 guint     gtk_key_snooper_install (GtkKeySnoopFunc snooper,
                                    gpointer        func_data);
@@ -198,10 +223,8 @@ gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
                                    const GValue          *handler_return,
                                    gpointer               dummy);
 
+gchar *_gtk_get_lc_ctype (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MAIN_H__ */