diff options
author | Michael Natterer <mitch@imendio.com> | 2008-06-30 12:15:29 +0000 |
---|---|---|
committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-30 12:15:29 +0000 |
commit | 971023d9221084d8d40e690fa8e44a4296f2cff1 (patch) | |
tree | 60ec50595a6931876eeddce2c449e25d64e011c4 /gdk | |
parent | 2e3c1149ae65bc14d86646f5daf3c174559e44db (diff) | |
download | gdk-pixbuf-971023d9221084d8d40e690fa8e44a4296f2cff1.tar.gz |
Some unrelated cleanups found while reviewing the offscreen window patch:
2008-06-30 Michael Natterer <mitch@imendio.com>
Some unrelated cleanups found while reviewing
the offscreen window patch:
* gdk/gdkwindow.c: add missing Since: 2.14 to the redirection
functions, fix some function header indentation, update
documentation of redirect_to_drawable().
* gdk/x11/gdkwindow-x11.c
* gdk/x11/gdkpixmap-x11.c: fix function header
formatting/indentation.
* gtk/gtkwidget.c: use I_() on "damage_event".
svn path=/trunk/; revision=20708
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/gdkwindow.c | 32 | ||||
-rw-r--r-- | gdk/x11/gdkpixmap-x11.c | 4 | ||||
-rw-r--r-- | gdk/x11/gdkwindow-x11.c | 12 |
3 files changed, 32 insertions, 16 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 7cba2daa2..2589988c4 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -4190,7 +4190,8 @@ gdk_window_set_composited (GdkWindow *window, static void -remove_redirect_from_children (GdkWindowObject *private, GdkWindowRedirect *redirect) +remove_redirect_from_children (GdkWindowObject *private, + GdkWindowRedirect *redirect) { GList *l; GdkWindowObject *child; @@ -4214,12 +4215,14 @@ remove_redirect_from_children (GdkWindowObject *private, GdkWindowRedirect *redi * * Removes and active redirection started by * gdk_window_redirect_to_drawable(). + * + * Since: 2.14 **/ void gdk_window_remove_redirection (GdkWindow *window) { GdkWindowObject *private; - + g_return_if_fail (GDK_IS_WINDOW (window)); private = (GdkWindowObject *) window; @@ -4234,7 +4237,8 @@ gdk_window_remove_redirection (GdkWindow *window) } static void -apply_redirect_to_children (GdkWindowObject *private, GdkWindowRedirect *redirect) +apply_redirect_to_children (GdkWindowObject *private, + GdkWindowRedirect *redirect) { GList *l; GdkWindowObject *child; @@ -4268,8 +4272,9 @@ apply_redirect_to_children (GdkWindowObject *private, GdkWindowRedirect *redirec * @width and @height is also drawn into @drawable at * @dest_x, @dest_y. * - * Only drawing between gdk_window_begin_paint_region() and - * gdk_window_end_paint() is redirected. + * Only drawing between gdk_window_begin_paint_region() or + * gdk_window_begin_paint_rect() and gdk_window_end_paint() is + * redirected. * * Redirection is active until gdk_window_remove_redirection() * is called. @@ -4277,13 +4282,18 @@ apply_redirect_to_children (GdkWindowObject *private, GdkWindowRedirect *redirec * This function should not be used on windows created by * gdk_window_new_offscreen(), as that is implemented using * redirection. + * + * Since: 2.14. **/ void -gdk_window_redirect_to_drawable (GdkWindow *window, +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) + gint src_x, + gint src_y, + gint dest_x, + gint dest_y, + gint width, + gint height) { GdkWindowObject *private; @@ -4512,7 +4522,9 @@ setup_redirect_clip (GdkWindow *window, } static void -reset_redirect_clip (GdkWindow *offscreen, GdkGC *gc, GdkWindowClipData *data) +reset_redirect_clip (GdkWindow *offscreen, + GdkGC *gc, + GdkWindowClipData *data) { /* offset back */ gdk_gc_offset (gc, data->x_offset, data->y_offset); diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 81d2b1da4..7984b5a08 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -57,8 +57,8 @@ typedef struct } _GdkPixmapInfo; static void gdk_pixmap_impl_x11_get_size (GdkDrawable *drawable, - gint *width, - gint *height); + gint *width, + gint *height); static void gdk_pixmap_impl_x11_dispose (GObject *object); static void gdk_pixmap_impl_x11_finalize (GObject *object); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 0975dcfff..cabebb48f 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3781,12 +3781,13 @@ do_shape_combine_region (GdkWindow *window, } #endif /* HAVE_SHAPE_EXT */ } + static void gdk_window_x11_shape_combine_region (GdkWindow *window, const GdkRegion *shape_region, gint offset_x, gint offset_y) -{ +{ do_shape_combine_region (window, shape_region, offset_x, offset_y, ShapeBounding); } @@ -4558,7 +4559,8 @@ gdk_window_unfullscreen (GdkWindow *window) * Since: 2.4 **/ void -gdk_window_set_keep_above (GdkWindow *window, gboolean setting) +gdk_window_set_keep_above (GdkWindow *window, + gboolean setting) { g_return_if_fail (GDK_IS_WINDOW (window)); @@ -5285,7 +5287,8 @@ gdk_window_merge_child_input_shapes (GdkWindow *window) static void -gdk_window_set_static_bit_gravity (GdkWindow *window, gboolean on) +gdk_window_set_static_bit_gravity (GdkWindow *window, + gboolean on) { XSetWindowAttributes xattributes; GdkWindowObject *private; @@ -5306,7 +5309,8 @@ gdk_window_set_static_bit_gravity (GdkWindow *window, gboolean on) } static void -gdk_window_set_static_win_gravity (GdkWindow *window, gboolean on) +gdk_window_set_static_win_gravity (GdkWindow *window, + gboolean on) { XSetWindowAttributes xattributes; |