From 7a6b7673351c8597a5cf976d59fdd7fd246a78d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 9 Jan 2011 09:29:11 -0500 Subject: ETree: Fix runtime warnings with GTK3. ETable has a "vertical-spacing" style property, ETree does not. ECellText expects it to be in both. --- widgets/table/e-cell-text.c | 15 ++++++++++++--- widgets/table/e-table.c | 19 ++++++++++--------- widgets/table/e-tree.c | 11 +++++++++++ 3 files changed, 33 insertions(+), 12 deletions(-) (limited to 'widgets') diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 87febf7c09..4d86378904 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -681,12 +681,21 @@ show_pango_rectangle (CellEdit *edit, PangoRectangle rect) } static gint -get_vertical_spacing (GtkWidget *widget) +get_vertical_spacing (GtkWidget *canvas) { - GtkStyle *style = gtk_rc_get_style (widget); + GtkStyle *style; + GtkWidget *widget; gint vspacing = 0; - gtk_style_get (style, E_TABLE_TYPE, "vertical-spacing", &vspacing, NULL); + g_return_val_if_fail (E_IS_CANVAS (canvas), 3); + + /* The parent should be either an ETable or ETree. */ + widget = gtk_widget_get_parent (canvas); + style = gtk_widget_get_style (widget); + + gtk_style_get ( + style, G_OBJECT_TYPE (widget), + "vertical-spacing", &vspacing, NULL); return vspacing; } diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 4cbd6556af..4dc13bfb1a 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -3513,15 +3513,16 @@ e_table_class_init (ETableClass *class) E_TABLE_MODEL_TYPE, G_PARAM_READABLE)); - gtk_widget_class_install_style_property (widget_class, - g_param_spec_int ("vertical-spacing", - "Vertical Row Spacing", - "Vertical space between rows. It is added to top and to bottom of a row", - 0, - G_MAXINT, - 3, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS)); + gtk_widget_class_install_style_property ( + widget_class, + g_param_spec_int ( + "vertical-spacing", + "Vertical Row Spacing", + "Vertical space between rows. " + "It is added to top and to bottom of a row", + 0, G_MAXINT, 3, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); gal_a11y_e_table_init (); } diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 5f0effaac8..8d718b0235 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -3584,6 +3584,17 @@ e_tree_class_init (ETreeClass *class) 10, G_PARAM_READABLE)); + gtk_widget_class_install_style_property ( + widget_class, + g_param_spec_int ( + "vertical-spacing", + "Vertical Row Spacing", + "Vertical space between rows. " + "It is added to top and to bottom of a row", + 0, G_MAXINT, 3, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + gal_a11y_e_tree_init (); } -- cgit