Bug 570896 - gdkevents-win32.c(2947) : error C4053: one void operand for

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

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index f0ee7f5c8d2563b36ad85846f41bddfc6db53e4f..866bb694675b3115f7090c04dd89eecb88839ebd 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -21,9 +21,13 @@
  * 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 (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_WINDOW_H__
 #define __GDK_WINDOW_H__
 
@@ -36,6 +40,7 @@ G_BEGIN_DECLS
 typedef struct _GdkGeometry           GdkGeometry;
 typedef struct _GdkWindowAttr        GdkWindowAttr;
 typedef struct _GdkPointerHooks              GdkPointerHooks;
+typedef struct _GdkWindowRedirect     GdkWindowRedirect;
 
 /* Classes of windows.
  *   InputOutput: Almost every window should be of this type. Such windows
@@ -300,6 +305,8 @@ struct _GdkWindowObject
   GdkEventMask event_mask;
 
   guint update_and_descendants_freeze_count;
+
+  GdkWindowRedirect *redirect;
 };
 
 struct _GdkWindowObjectClass
@@ -558,7 +565,7 @@ gboolean      gdk_window_get_decorations (GdkWindow       *window,
                                          GdkWMDecoration *decorations);
 void         gdk_window_set_functions   (GdkWindow       *window,
                                          GdkWMFunction    functions);
-#ifndef GDK_MULTIHEAD_SAFE
+#if !defined(GDK_MULTIHEAD_SAFE) && !defined(GDK_DISABLE_DEPRECATED)
 GList *       gdk_window_get_toplevels   (void);
 #endif
 
@@ -638,6 +645,13 @@ GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);
 
 GdkWindow *gdk_get_default_root_window (void);
 
+void gdk_window_redirect_to_drawable (GdkWindow *window,
+                                     GdkDrawable *drawable,
+                                     gint src_x, gint src_y,
+                                     gint dest_x, gint dest_y,
+                                     gint width, gint height);
+void gdk_window_remove_redirection   (GdkWindow *window);
+
 #ifndef GDK_DISABLE_DEPRECATED
 #define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
 #define gdk_window_get_size            gdk_drawable_get_size