make args const, 74159 (gtk_tree_view_insert_column_with_attributes):

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

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 9c4d8365577cd68b3921d2fa55acf20bb51ae227..308130fb07e87a768be8e1a6a0bb891523f82fdf 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -31,10 +31,10 @@
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkdnd.h>
 #include <gdk/gdkdrawable.h>
+#include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkfont.h>
 #include <gdk/gdkgc.h>
-#include <gdk/gdkim.h>
 #include <gdk/gdkimage.h>
 #include <gdk/gdkinput.h>
 #include <gdk/gdkkeys.h>
@@ -49,8 +49,6 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
-#include <gdk/gdkcompat.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -63,20 +61,28 @@ void          gdk_init                      (gint           *argc,
                                         gchar        ***argv);
 gboolean  gdk_init_check               (gint           *argc,
                                         gchar        ***argv);
+
+#ifndef GDK_DISABLE_DEPRECATED
 void     gdk_exit                      (gint            error_code);
+#endif /* GDK_DISABLE_DEPRECATED */
 gchar*   gdk_set_locale                (void);
 
+G_CONST_RETURN char *gdk_get_program_class (void);
+void                 gdk_set_program_class (const char *program_class);
+
 /* Push and pop error handlers for X errors
  */
 void      gdk_error_trap_push           (void);
 gint      gdk_error_trap_pop            (void);
 
-
+#ifndef GDK_DISABLE_DEPRECATED
 void     gdk_set_use_xshm              (gboolean        use_xshm);
-
 gboolean  gdk_get_use_xshm             (void);
+#endif /* GDK_DISABLE_DEPRECATED */
+
 gchar*   gdk_get_display               (void);
 
+#ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add_full          (gint              source,
                           GdkInputCondition condition,
                           GdkInputFunction  function,
@@ -87,6 +93,7 @@ gint gdk_input_add      (gint              source,
                           GdkInputFunction  function,
                           gpointer          data);
 void gdk_input_remove    (gint              tag);
+#endif /* GDK_DISABLE_DEPRECATED */
 
 GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
                                      gboolean      owner_events,
@@ -110,8 +117,7 @@ gint gdk_screen_height_mm (void) G_GNUC_CONST;
 void gdk_flush (void);
 void gdk_beep (void);
 
-void gdk_key_repeat_disable (void);
-void gdk_key_repeat_restore (void);
+void gdk_set_double_click_time (guint msec);
 
 /* Rectangle utilities
  */
@@ -122,6 +128,10 @@ void     gdk_rectangle_union     (GdkRectangle *src1,
                                  GdkRectangle *src2,
                                  GdkRectangle *dest);
 
+GType gdk_rectangle_get_type (void);
+
+#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
+
 /* Conversion functions between wide char and multibyte strings. 
  */
 gchar     *gdk_wcstombs          (const GdkWChar   *src);
@@ -141,6 +151,7 @@ GDKVAR GMutex *gdk_threads_mutex;
 
 void     gdk_threads_enter                (void);
 void     gdk_threads_leave                (void);
+void     gdk_threads_init                 (void);  
 
 #ifdef G_THREADS_ENABLED
 #  define GDK_THREADS_ENTER()  G_STMT_START {  \