gimp r25307 - in trunk: . app/display app/widgets
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25307 - in trunk: . app/display app/widgets
- Date: Sat, 29 Mar 2008 23:43:40 +0000 (GMT)
Author: mitch
Date: Sat Mar 29 23:43:39 2008
New Revision: 25307
URL: http://svn.gnome.org/viewvc/gimp?rev=25307&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/app/display/gimpcanvas.c
trunk/app/widgets/gimpcoloreditor.c
trunk/app/widgets/gimpcolorframe.c
trunk/app/widgets/gimpcursorview.c
trunk/app/widgets/gimpcurveview.c
trunk/app/widgets/gimpdataeditor.c
trunk/app/widgets/gimpdock.c
trunk/app/widgets/gimpdockable.c
trunk/app/widgets/gimpdockbook.c
trunk/app/widgets/gimpdockseparator.c
trunk/app/widgets/gimpeditor.c
trunk/app/widgets/gimplayertreeview.c
trunk/app/widgets/gimpmenudock.c
trunk/app/widgets/gimpsamplepointeditor.c
trunk/app/widgets/gimptoolbox.c
Modified: trunk/app/display/gimpcanvas.c
==============================================================================
--- trunk/app/display/gimpcanvas.c (original)
+++ trunk/app/display/gimpcanvas.c Sat Mar 29 23:43:39 2008
@@ -274,8 +274,7 @@
{
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)
{
Modified: trunk/app/widgets/gimpcoloreditor.c
==============================================================================
--- trunk/app/widgets/gimpcoloreditor.c (original)
+++ trunk/app/widgets/gimpcoloreditor.c Sat Mar 29 23:43:39 2008
@@ -476,8 +476,7 @@
{
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));
Modified: trunk/app/widgets/gimpcolorframe.c
==============================================================================
--- trunk/app/widgets/gimpcolorframe.c (original)
+++ trunk/app/widgets/gimpcolorframe.c Sat Mar 29 23:43:39 2008
@@ -254,8 +254,7 @@
{
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)
{
Modified: trunk/app/widgets/gimpcursorview.c
==============================================================================
--- trunk/app/widgets/gimpcursorview.c (original)
+++ trunk/app/widgets/gimpcursorview.c Sat Mar 29 23:43:39 2008
@@ -317,8 +317,7 @@
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,
Modified: trunk/app/widgets/gimpcurveview.c
==============================================================================
--- trunk/app/widgets/gimpcurveview.c (original)
+++ trunk/app/widgets/gimpcurveview.c Sat Mar 29 23:43:39 2008
@@ -226,8 +226,7 @@
{
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)
{
Modified: trunk/app/widgets/gimpdataeditor.c
==============================================================================
--- trunk/app/widgets/gimpdataeditor.c (original)
+++ trunk/app/widgets/gimpdataeditor.c Sat Mar 29 23:43:39 2008
@@ -313,8 +313,7 @@
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,
Modified: trunk/app/widgets/gimpdock.c
==============================================================================
--- trunk/app/widgets/gimpdock.c (original)
+++ trunk/app/widgets/gimpdock.c Sat Mar 29 23:43:39 2008
@@ -373,8 +373,7 @@
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);
Modified: trunk/app/widgets/gimpdockable.c
==============================================================================
--- trunk/app/widgets/gimpdockable.c (original)
+++ trunk/app/widgets/gimpdockable.c Sat Mar 29 23:43:39 2008
@@ -430,8 +430,7 @@
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,
Modified: trunk/app/widgets/gimpdockbook.c
==============================================================================
--- trunk/app/widgets/gimpdockbook.c (original)
+++ trunk/app/widgets/gimpdockbook.c Sat Mar 29 23:43:39 2008
@@ -228,8 +228,7 @@
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,
Modified: trunk/app/widgets/gimpdockseparator.c
==============================================================================
--- trunk/app/widgets/gimpdockseparator.c (original)
+++ trunk/app/widgets/gimpdockseparator.c Sat Mar 29 23:43:39 2008
@@ -115,8 +115,7 @@
{
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);
Modified: trunk/app/widgets/gimpeditor.c
==============================================================================
--- trunk/app/widgets/gimpeditor.c (original)
+++ trunk/app/widgets/gimpeditor.c Sat Mar 29 23:43:39 2008
@@ -339,8 +339,7 @@
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);
Modified: trunk/app/widgets/gimplayertreeview.c
==============================================================================
--- trunk/app/widgets/gimplayertreeview.c (original)
+++ trunk/app/widgets/gimplayertreeview.c Sat Mar 29 23:43:39 2008
@@ -438,8 +438,7 @@
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);
}
Modified: trunk/app/widgets/gimpmenudock.c
==============================================================================
--- trunk/app/widgets/gimpmenudock.c (original)
+++ trunk/app/widgets/gimpmenudock.c Sat Mar 29 23:43:39 2008
@@ -216,7 +216,7 @@
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 @@
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 @@
if (image == NULL && ! gimp_container_is_empty (image_container))
{
image = GIMP_IMAGE (gimp_container_get_child_by_index (image_container,
- 0));
+ 0));
if (image)
{
Modified: trunk/app/widgets/gimpsamplepointeditor.c
==============================================================================
--- trunk/app/widgets/gimpsamplepointeditor.c (original)
+++ trunk/app/widgets/gimpsamplepointeditor.c Sat Mar 29 23:43:39 2008
@@ -242,8 +242,7 @@
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,
Modified: trunk/app/widgets/gimptoolbox.c
==============================================================================
--- trunk/app/widgets/gimptoolbox.c (original)
+++ trunk/app/widgets/gimptoolbox.c Sat Mar 29 23:43:39 2008
@@ -436,8 +436,7 @@
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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]