From 8088b64c7200bf6b9dc3db43b805ca34b9fd0f09 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 29 Mar 2008 23:43:39 +0000 Subject: [PATCH] app/display/gimpcanvas.c app/widgets/gimpcoloreditor.c 2008-03-30 Michael Natterer * app/display/gimpcanvas.c * app/widgets/gimpcoloreditor.c * app/widgets/gimpcolorframe.c * app/widgets/gimpcursorview.c * app/widgets/gimpcurveview.c * app/widgets/gimpdataeditor.c * app/widgets/gimpdock.c * app/widgets/gimpdockable.c * app/widgets/gimpdockbook.c * app/widgets/gimpdockseparator.c * app/widgets/gimpeditor.c * app/widgets/gimplayertreeview.c * app/widgets/gimpmenudock.c * app/widgets/gimpsamplepointeditor.c * app/widgets/gimptoolbox.c: chain up unconditionally in GtkWidget::style_set() because there is has a default implementation. svn path=/trunk/; revision=25307 --- ChangeLog | 20 ++++++++++++++++++++ app/display/gimpcanvas.c | 3 +-- app/widgets/gimpcoloreditor.c | 3 +-- app/widgets/gimpcolorframe.c | 3 +-- app/widgets/gimpcursorview.c | 3 +-- app/widgets/gimpcurveview.c | 3 +-- app/widgets/gimpdataeditor.c | 3 +-- app/widgets/gimpdock.c | 3 +-- app/widgets/gimpdockable.c | 3 +-- app/widgets/gimpdockbook.c | 3 +-- app/widgets/gimpdockseparator.c | 3 +-- app/widgets/gimpeditor.c | 3 +-- app/widgets/gimplayertreeview.c | 3 +-- app/widgets/gimpmenudock.c | 9 +++------ app/widgets/gimpsamplepointeditor.c | 3 +-- app/widgets/gimptoolbox.c | 3 +-- 16 files changed, 37 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6cb927cf6..7ba31e355d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-03-30 Michael Natterer + + * app/display/gimpcanvas.c + * app/widgets/gimpcoloreditor.c + * app/widgets/gimpcolorframe.c + * app/widgets/gimpcursorview.c + * app/widgets/gimpcurveview.c + * app/widgets/gimpdataeditor.c + * app/widgets/gimpdock.c + * app/widgets/gimpdockable.c + * app/widgets/gimpdockbook.c + * app/widgets/gimpdockseparator.c + * app/widgets/gimpeditor.c + * app/widgets/gimplayertreeview.c + * app/widgets/gimpmenudock.c + * app/widgets/gimpsamplepointeditor.c + * app/widgets/gimptoolbox.c: chain up unconditionally in + GtkWidget::style_set() because there is has a default + implementation. + 2008-03-29 Michael Natterer * app/widgets/gimpmenudock.c (gimp_menu_dock_auto_clicked): when diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c index b15e3f64a3..db62618813 100644 --- a/app/display/gimpcanvas.c +++ b/app/display/gimpcanvas.c @@ -274,8 +274,7 @@ gimp_canvas_style_set (GtkWidget *widget, { GimpCanvas *canvas = GIMP_CANVAS (widget); - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); if (canvas->layout) { diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c index a2b060eba2..8100b62805 100644 --- a/app/widgets/gimpcoloreditor.c +++ b/app/widgets/gimpcoloreditor.c @@ -476,8 +476,7 @@ gimp_color_editor_style_set (GtkWidget *widget, { GimpColorEditor *editor = GIMP_COLOR_EDITOR (widget); - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); if (editor->hbox) gimp_editor_set_box_style (GIMP_EDITOR (editor), GTK_BOX (editor->hbox)); diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c index 9f392fbbb8..61982629d1 100644 --- a/app/widgets/gimpcolorframe.c +++ b/app/widgets/gimpcolorframe.c @@ -254,8 +254,7 @@ gimp_color_frame_style_set (GtkWidget *widget, { GimpColorFrame *frame = GIMP_COLOR_FRAME (widget); - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); if (frame->number_layout) { diff --git a/app/widgets/gimpcursorview.c b/app/widgets/gimpcursorview.c index 2437bd658e..f71727bd78 100644 --- a/app/widgets/gimpcursorview.c +++ b/app/widgets/gimpcursorview.c @@ -317,8 +317,7 @@ gimp_cursor_view_style_set (GtkWidget *widget, GimpCursorView *view = GIMP_CURSOR_VIEW (widget); gint content_spacing; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (GTK_WIDGET (view), "content-spacing", &content_spacing, diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c index 2e9ae3a40b..c812a989ed 100644 --- a/app/widgets/gimpcurveview.c +++ b/app/widgets/gimpcurveview.c @@ -226,8 +226,7 @@ gimp_curve_view_style_set (GtkWidget *widget, { GimpCurveView *view = GIMP_CURVE_VIEW (widget); - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); if (view->xpos_layout) { diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c index d5e77cd994..817e1aabc9 100644 --- a/app/widgets/gimpdataeditor.c +++ b/app/widgets/gimpdataeditor.c @@ -313,8 +313,7 @@ gimp_data_editor_style_set (GtkWidget *widget, GimpDataEditor *editor = GIMP_DATA_EDITOR (widget); gint minimal_height; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "minimal-height", &minimal_height, diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c index 64c1b8f14a..df7f435763 100644 --- a/app/widgets/gimpdock.c +++ b/app/widgets/gimpdock.c @@ -373,8 +373,7 @@ gimp_dock_style_set (GtkWidget *widget, gchar *font_str; gchar *rc_string; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "default-height", &default_height, NULL); diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index 4e61bfc14e..9ebe0de45d 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -430,8 +430,7 @@ gimp_dockable_style_set (GtkWidget *widget, GimpDockable *dockable = GIMP_DOCKABLE (widget); gint content_border; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "content-border", &content_border, diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c index f5fbbe58a7..edd22082a6 100644 --- a/app/widgets/gimpdockbook.c +++ b/app/widgets/gimpdockbook.c @@ -228,8 +228,7 @@ gimp_dockbook_style_set (GtkWidget *widget, GList *list; gint tab_border; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "tab-border", &tab_border, diff --git a/app/widgets/gimpdockseparator.c b/app/widgets/gimpdockseparator.c index 61155edcb7..d3d9a04592 100644 --- a/app/widgets/gimpdockseparator.c +++ b/app/widgets/gimpdockseparator.c @@ -115,8 +115,7 @@ gimp_dock_separator_style_set (GtkWidget *widget, { gint height; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "height", &height, NULL); diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c index 16c7ed3be3..29cb8b7d90 100644 --- a/app/widgets/gimpeditor.c +++ b/app/widgets/gimpeditor.c @@ -339,8 +339,7 @@ gimp_editor_style_set (GtkWidget *widget, GimpEditor *editor = GIMP_EDITOR (widget); gint content_spacing; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "content-spacing", &content_spacing, NULL); diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index bfe9e37278..3104932e2b 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -438,8 +438,7 @@ gimp_layer_tree_view_style_set (GtkWidget *widget, gtk_table_set_row_spacings (GTK_TABLE (layer_view->options_box), content_spacing); - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); } diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c index b095420986..73843f3008 100644 --- a/app/widgets/gimpmenudock.c +++ b/app/widgets/gimpmenudock.c @@ -216,7 +216,7 @@ static void gimp_menu_dock_style_set (GtkWidget *widget, GtkStyle *prev_style) { - GimpMenuDock *menu_dock; + GimpMenuDock *menu_dock = GIMP_MENU_DOCK (widget); gint minimal_width; GtkIconSize menu_view_size; GtkSettings *settings; @@ -226,10 +226,7 @@ gimp_menu_dock_style_set (GtkWidget *widget, gint focus_padding; gint ythickness; - menu_dock = GIMP_MENU_DOCK (widget); - - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "minimal-width", &minimal_width, @@ -562,7 +559,7 @@ gimp_menu_dock_image_changed (GimpContext *context, if (image == NULL && ! gimp_container_is_empty (image_container)) { image = GIMP_IMAGE (gimp_container_get_child_by_index (image_container, - 0)); + 0)); if (image) { diff --git a/app/widgets/gimpsamplepointeditor.c b/app/widgets/gimpsamplepointeditor.c index 6cb46c7881..cce73a3ccd 100644 --- a/app/widgets/gimpsamplepointeditor.c +++ b/app/widgets/gimpsamplepointeditor.c @@ -242,8 +242,7 @@ gimp_sample_point_editor_style_set (GtkWidget *widget, GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (widget); gint content_spacing; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style); gtk_widget_style_get (widget, "content-spacing", &content_spacing, diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c index 31fc7933ee..5cbf2a15e8 100644 --- a/app/widgets/gimptoolbox.c +++ b/app/widgets/gimptoolbox.c @@ -436,8 +436,7 @@ gimp_toolbox_style_set (GtkWidget *widget, GtkReliefStyle relief; GList *list; - if (GTK_WIDGET_CLASS (parent_class)->style_set) - GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); + GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); if (! GIMP_DOCK (widget)->context) return;