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 3e169c43981858fde560df4e22508ae15305e8ad..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
@@ -365,13 +372,13 @@ void          gdk_window_add_filter            (GdkWindow     *window,
 void          gdk_window_remove_filter         (GdkWindow     *window,
                                                 GdkFilterFunc  function,
                                                 gpointer       data);
-void          gdk_window_scroll                (GdkWindow *window,
-                                                gint       dx,
-                                                gint       dy);
-void         gdk_window_move_region           (GdkWindow *window,
-                                               GdkRegion *region,
-                                               gint       dx,
-                                               gint       dy);
+void          gdk_window_scroll                (GdkWindow     *window,
+                                                gint           dx,
+                                                gint           dy);
+void         gdk_window_move_region           (GdkWindow       *window,
+                                               const GdkRegion *region,
+                                               gint             dx,
+                                               gint             dy);
 
 /* 
  * This allows for making shaped (partially transparent) windows
@@ -379,14 +386,14 @@ void            gdk_window_move_region           (GdkWindow *window,
  *  The shape_mask can be the mask
  *  from gdk_pixmap_create_from_xpm.   Stefan Wille
  */
-void gdk_window_shape_combine_mask  (GdkWindow     *window,
-                                     GdkBitmap     *mask,
-                                     gint           x,
-                                     gint           y);
-void gdk_window_shape_combine_region (GdkWindow            *window,
-                                      GdkRegion     *shape_region,
-                                      gint          offset_x,
-                                      gint          offset_y);
+void gdk_window_shape_combine_mask  (GdkWindow       *window,
+                                     GdkBitmap       *mask,
+                                     gint             x,
+                                     gint             y);
+void gdk_window_shape_combine_region (GdkWindow              *window,
+                                      const GdkRegion *shape_region,
+                                      gint            offset_x,
+                                      gint            offset_y);
 
 /*
  * This routine allows you to quickly take the shapes of all the child windows
@@ -398,7 +405,7 @@ void gdk_window_shape_combine_region (GdkWindow         *window,
 void gdk_window_set_child_shapes (GdkWindow *window);
 
 void gdk_window_set_composited   (GdkWindow *window,
-                                  gboolean composited);
+                                  gboolean   composited);
 
 /*
  * This routine allows you to merge (ie ADD) child shapes to your
@@ -407,18 +414,18 @@ void gdk_window_set_composited   (GdkWindow *window,
  * 
  * - Raster
  */
-void gdk_window_merge_child_shapes (GdkWindow *window);
+void gdk_window_merge_child_shapes         (GdkWindow       *window);
 
-void gdk_window_input_shape_combine_mask   (GdkWindow *window,
-                                           GdkBitmap *mask,
-                                           gint       x,
-                                           gint       y);
-void gdk_window_input_shape_combine_region (GdkWindow *window,
-                                            GdkRegion *shape_region,
-                                            gint       offset_x,
-                                            gint       offset_y);
-void gdk_window_set_child_input_shapes     (GdkWindow *window);
-void gdk_window_merge_child_input_shapes   (GdkWindow *window);
+void gdk_window_input_shape_combine_mask   (GdkWindow       *window,
+                                           GdkBitmap       *mask,
+                                           gint             x,
+                                           gint             y);
+void gdk_window_input_shape_combine_region (GdkWindow       *window,
+                                            const GdkRegion *shape_region,
+                                            gint             offset_x,
+                                            gint             offset_y);
+void gdk_window_set_child_input_shapes     (GdkWindow       *window);
+void gdk_window_merge_child_input_shapes   (GdkWindow       *window);
 
 
 /*
@@ -475,16 +482,16 @@ void gdk_window_set_skip_pager_hint   (GdkWindow *window,
 void gdk_window_set_urgency_hint      (GdkWindow *window,
                                       gboolean   urgent);
 
-void          gdk_window_set_geometry_hints (GdkWindow        *window,
-                                            GdkGeometry      *geometry,
-                                            GdkWindowHints    geom_mask);
-void          gdk_set_sm_client_id         (const gchar *sm_client_id);
+void          gdk_window_set_geometry_hints (GdkWindow          *window,
+                                            const GdkGeometry  *geometry,
+                                            GdkWindowHints      geom_mask);
+void          gdk_set_sm_client_id          (const gchar        *sm_client_id);
 
-void         gdk_window_begin_paint_rect   (GdkWindow    *window,
-                                            GdkRectangle *rectangle);
-void         gdk_window_begin_paint_region (GdkWindow    *window,
-                                            GdkRegion    *region);
-void         gdk_window_end_paint          (GdkWindow    *window);
+void         gdk_window_begin_paint_rect   (GdkWindow          *window,
+                                            const GdkRectangle *rectangle);
+void         gdk_window_begin_paint_region (GdkWindow          *window,
+                                            const GdkRegion    *region);
+void         gdk_window_end_paint          (GdkWindow          *window);
 
 void         gdk_window_set_title         (GdkWindow     *window,
                                            const gchar   *title);
@@ -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
 
@@ -592,14 +599,14 @@ void gdk_window_begin_move_drag   (GdkWindow     *window,
                                    guint32        timestamp);
 
 /* Interface for dirty-region queueing */
-void       gdk_window_invalidate_rect           (GdkWindow    *window,
-                                                GdkRectangle *rect,
-                                                gboolean      invalidate_children);
-void       gdk_window_invalidate_region         (GdkWindow    *window,
-                                                GdkRegion    *region,
-                                                gboolean      invalidate_children);
-void       gdk_window_invalidate_maybe_recurse  (GdkWindow *window,
-                                                GdkRegion *region,
+void       gdk_window_invalidate_rect           (GdkWindow          *window,
+                                                const GdkRectangle *rect,
+                                                gboolean            invalidate_children);
+void       gdk_window_invalidate_region         (GdkWindow          *window,
+                                                const GdkRegion    *region,
+                                                gboolean            invalidate_children);
+void       gdk_window_invalidate_maybe_recurse  (GdkWindow          *window,
+                                                const GdkRegion    *region,
                                                 gboolean (*child_func) (GdkWindow *, gpointer),
                                                 gpointer   user_data);
 GdkRegion *gdk_window_get_update_area     (GdkWindow    *window);
@@ -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