Practically everything changed.

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

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4cbe1068e5745bedaed310a88119388c15da35d9..b4adf414e7c27768c0d78d172ff3be286bccd1db 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1,4 +1,4 @@
-/* GDK - The GIMP Drawing Kit
+/* GDK - The GTK+ Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -21,16 +21,20 @@
  * 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/.
  */
 
 #ifndef __GDK_H__
 #define __GDK_H__
 
+#define __GDK_H_INSIDE__
+
+#include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcolor.h>
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkdisplay.h>
+#include <gdk/gdkdisplaymanager.h>
 #include <gdk/gdkdnd.h>
 #include <gdk/gdkdrawable.h>
 #include <gdk/gdkenumtypes.h>
@@ -40,7 +44,6 @@
 #include <gdk/gdkimage.h>
 #include <gdk/gdkinput.h>
 #include <gdk/gdkkeys.h>
-#include <gdk/gdkdisplaymanager.h>
 #include <gdk/gdkpango.h>
 #include <gdk/gdkpixbuf.h>
 #include <gdk/gdkpixmap.h>
@@ -50,13 +53,14 @@
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkselection.h>
 #include <gdk/gdkspawn.h>
+#include <gdk/gdktestutils.h>
 #include <gdk/gdktypes.h>
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#undef __GDK_H_INSIDE__
+
+G_BEGIN_DECLS
 
 
 /* Initialization, exit and events
@@ -98,7 +102,7 @@ gint gdk_input_add_full        (gint              source,
                           GdkInputCondition condition,
                           GdkInputFunction  function,
                           gpointer          data,
-                          GdkDestroyNotify  destroy);
+                          GDestroyNotify    destroy);
 #endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
 #ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add       (gint              source,
@@ -147,12 +151,12 @@ void gdk_set_double_click_time             (guint       msec);
 
 /* Rectangle utilities
  */
-gboolean gdk_rectangle_intersect (GdkRectangle *src1,
-                                 GdkRectangle *src2,
-                                 GdkRectangle *dest);
-void     gdk_rectangle_union     (GdkRectangle *src1,
-                                 GdkRectangle *src2,
-                                 GdkRectangle *dest);
+gboolean gdk_rectangle_intersect (const GdkRectangle *src1,
+                                 const GdkRectangle *src2,
+                                 GdkRectangle       *dest);
+void     gdk_rectangle_union     (const GdkRectangle *src1,
+                                 const GdkRectangle *src2,
+                                 GdkRectangle       *dest);
 
 GType gdk_rectangle_get_type (void) G_GNUC_CONST;
 
@@ -179,6 +183,8 @@ gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
 
 void gdk_notify_startup_complete (void);
 
+void gdk_notify_startup_complete_with_id (const gchar* startup_id);
+
 /* Threading
  */
 
@@ -195,6 +201,21 @@ void     gdk_threads_init                 (void);
 void     gdk_threads_set_lock_functions   (GCallback enter_fn,
                                           GCallback leave_fn);
 
+guint    gdk_threads_add_idle_full        (gint           priority,
+                                          GSourceFunc    function,
+                                          gpointer       data,
+                                          GDestroyNotify notify);
+guint    gdk_threads_add_idle             (GSourceFunc    function,
+                                          gpointer       data);
+guint    gdk_threads_add_timeout_full     (gint           priority,
+                                           guint          interval,
+                                           GSourceFunc    function,
+                                           gpointer       data,
+                                           GDestroyNotify notify);
+guint    gdk_threads_add_timeout          (guint          interval,
+                                           GSourceFunc    function,
+                                           gpointer       data);
+
 #ifdef G_THREADS_ENABLED
 #  define GDK_THREADS_ENTER()  G_STMT_START {  \
       if (gdk_threads_lock)                    \
@@ -209,9 +230,7 @@ void     gdk_threads_set_lock_functions   (GCallback enter_fn,
 #  define GDK_THREADS_LEAVE()
 #endif /* !G_THREADS_ENABLED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GDK_H__ */