diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -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 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 5 |
5 files changed, 50 insertions, 18 deletions
@@ -1,5 +1,20 @@ 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". + +2008-06-30 Michael Natterer <mitch@imendio.com> + * gdk/gdkinternals.h: remove duplicate declaration of _gdk_window_new(). diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 7cba2daa20..2589988c4c 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 81d2b1da47..7984b5a089 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 0975dcfff2..cabebb48fa 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; diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 7c6d983602..5c5a2f6069 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2025,9 +2025,10 @@ gtk_widget_class_init (GtkWidgetClass *klass) * Since: 2.14 */ widget_signals[DAMAGE_EVENT] = - g_signal_new ("damage_event", + g_signal_new (I_("damage_event"), G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, 0, + G_SIGNAL_RUN_LAST, + 0, _gtk_boolean_handled_accumulator, NULL, _gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, |