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>
* app/widgets/gimpmenudock.c (gimp_menu_dock_auto_clicked): when

View File

@ -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)
{

View File

@ -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));

View File

@ -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)
{

View File

@ -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,

View File

@ -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)
{

View File

@ -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,

View File

@ -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);

View File

@ -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,

View File

@ -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,

View File

@ -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);

View File

@ -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);

View File

@ -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);
}

View File

@ -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)
{

View File

@ -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,

View File

@ -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;