app/display/gimpcanvas.c app/widgets/gimpcoloreditor.c

2008-03-30  Michael Natterer  <mitch@gimp.org>

	* 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
This commit is contained in:
Michael Natterer 2008-03-29 23:43:39 +00:00 committed by Michael Natterer
parent e21528d4f3
commit 8088b64c72
16 changed files with 37 additions and 34 deletions

View File

@ -1,3 +1,23 @@
2008-03-30 Michael Natterer <mitch@gimp.org>
* 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 <mitch@gimp.org> 2008-03-29 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpmenudock.c (gimp_menu_dock_auto_clicked): when * app/widgets/gimpmenudock.c (gimp_menu_dock_auto_clicked): when

View File

@ -274,7 +274,6 @@ gimp_canvas_style_set (GtkWidget *widget,
{ {
GimpCanvas *canvas = GIMP_CANVAS (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) if (canvas->layout)

View File

@ -476,7 +476,6 @@ gimp_color_editor_style_set (GtkWidget *widget,
{ {
GimpColorEditor *editor = GIMP_COLOR_EDITOR (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) if (editor->hbox)

View File

@ -254,7 +254,6 @@ gimp_color_frame_style_set (GtkWidget *widget,
{ {
GimpColorFrame *frame = GIMP_COLOR_FRAME (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) if (frame->number_layout)

View File

@ -317,7 +317,6 @@ gimp_cursor_view_style_set (GtkWidget *widget,
GimpCursorView *view = GIMP_CURSOR_VIEW (widget); GimpCursorView *view = GIMP_CURSOR_VIEW (widget);
gint content_spacing; 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), gtk_widget_style_get (GTK_WIDGET (view),

View File

@ -226,7 +226,6 @@ gimp_curve_view_style_set (GtkWidget *widget,
{ {
GimpCurveView *view = GIMP_CURVE_VIEW (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) if (view->xpos_layout)

View File

@ -313,7 +313,6 @@ gimp_data_editor_style_set (GtkWidget *widget,
GimpDataEditor *editor = GIMP_DATA_EDITOR (widget); GimpDataEditor *editor = GIMP_DATA_EDITOR (widget);
gint minimal_height; 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, gtk_widget_style_get (widget,

View File

@ -373,7 +373,6 @@ gimp_dock_style_set (GtkWidget *widget,
gchar *font_str; gchar *font_str;
gchar *rc_string; 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); gtk_widget_style_get (widget, "default-height", &default_height, NULL);

View File

@ -430,7 +430,6 @@ gimp_dockable_style_set (GtkWidget *widget,
GimpDockable *dockable = GIMP_DOCKABLE (widget); GimpDockable *dockable = GIMP_DOCKABLE (widget);
gint content_border; 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, gtk_widget_style_get (widget,

View File

@ -228,7 +228,6 @@ gimp_dockbook_style_set (GtkWidget *widget,
GList *list; GList *list;
gint tab_border; 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, gtk_widget_style_get (widget,

View File

@ -115,7 +115,6 @@ gimp_dock_separator_style_set (GtkWidget *widget,
{ {
gint height; 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); gtk_widget_style_get (widget, "height", &height, NULL);

View File

@ -339,7 +339,6 @@ gimp_editor_style_set (GtkWidget *widget,
GimpEditor *editor = GIMP_EDITOR (widget); GimpEditor *editor = GIMP_EDITOR (widget);
gint content_spacing; 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); gtk_widget_style_get (widget, "content-spacing", &content_spacing, NULL);

View File

@ -438,7 +438,6 @@ gimp_layer_tree_view_style_set (GtkWidget *widget,
gtk_table_set_row_spacings (GTK_TABLE (layer_view->options_box), gtk_table_set_row_spacings (GTK_TABLE (layer_view->options_box),
content_spacing); 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);
} }

View File

@ -216,7 +216,7 @@ static void
gimp_menu_dock_style_set (GtkWidget *widget, gimp_menu_dock_style_set (GtkWidget *widget,
GtkStyle *prev_style) GtkStyle *prev_style)
{ {
GimpMenuDock *menu_dock; GimpMenuDock *menu_dock = GIMP_MENU_DOCK (widget);
gint minimal_width; gint minimal_width;
GtkIconSize menu_view_size; GtkIconSize menu_view_size;
GtkSettings *settings; GtkSettings *settings;
@ -226,9 +226,6 @@ gimp_menu_dock_style_set (GtkWidget *widget,
gint focus_padding; gint focus_padding;
gint ythickness; 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, gtk_widget_style_get (widget,

View File

@ -242,7 +242,6 @@ gimp_sample_point_editor_style_set (GtkWidget *widget,
GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (widget); GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (widget);
gint content_spacing; 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, gtk_widget_style_get (widget,

View File

@ -436,7 +436,6 @@ gimp_toolbox_style_set (GtkWidget *widget,
GtkReliefStyle relief; GtkReliefStyle relief;
GList *list; 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) if (! GIMP_DOCK (widget)->context)