diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-09 22:29:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-09 22:32:29 +0800 |
| commit | 7a6b7673351c8597a5cf976d59fdd7fd246a78d5 (patch) | |
| tree | 5c483fd9c569a93d1b51d9c79c7886f6b5ed777e /widgets/table/e-cell-text.c | |
| parent | e80b02e40cd630946e1898b1b988a14e21ee45c4 (diff) | |
| download | gsoc2013-evolution-7a6b7673351c8597a5cf976d59fdd7fd246a78d5.tar.gz gsoc2013-evolution-7a6b7673351c8597a5cf976d59fdd7fd246a78d5.tar.zst gsoc2013-evolution-7a6b7673351c8597a5cf976d59fdd7fd246a78d5.zip | |
ETree: Fix runtime warnings with GTK3.
ETable has a "vertical-spacing" style property, ETree does not.
ECellText expects it to be in both.
Diffstat (limited to 'widgets/table/e-cell-text.c')
| -rw-r--r-- | widgets/table/e-cell-text.c | 15 |
1 files changed, 12 insertions, 3 deletions
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; } |