diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
| commit | a55021bcef7eb082b48e56aac361bd35a3a77b64 (patch) | |
| tree | 9bcf1c1bbf522c87beac5d199b258f8aa24c7d7e /libgnomecanvas/gnome-canvas-text.c | |
| parent | ead63f16b2269325c1e4080b3dce8818bbafe189 (diff) | |
| download | gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.gz gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.zst gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.zip | |
Revert "Fix all remaining GTK3 issues."
This reverts commit fd8b55edaa88906b588aa07d9eadcacd34a7a774.
Something in this commit seriously hosed ETable, making Evolution pretty
much unusable. Reverting this until I can track down the problem.
Diffstat (limited to 'libgnomecanvas/gnome-canvas-text.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index c7e58aef0d..81cc357e41 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -1307,13 +1307,9 @@ gnome_canvas_text_get_property (GObject *object, static void gnome_canvas_text_apply_font_desc (GnomeCanvasText *text) { - PangoFontDescription *font_desc; - GtkWidget *widget; - GtkStyle *style; - - widget = GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas); - style = gtk_widget_get_style (widget); - font_desc = pango_font_description_copy (style->font_desc); + PangoFontDescription *font_desc = + pango_font_description_copy ( + GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas)->style->font_desc); if (text->font_desc) pango_font_description_merge (font_desc, text->font_desc, TRUE); @@ -1427,8 +1423,6 @@ gnome_canvas_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_pa static void gnome_canvas_text_realize (GnomeCanvasItem *item) { - GtkLayout *layout; - GdkWindow *bin_window; GnomeCanvasText *text; text = GNOME_CANVAS_TEXT (item); @@ -1436,10 +1430,7 @@ gnome_canvas_text_realize (GnomeCanvasItem *item) if (parent_class->realize) (* parent_class->realize) (item); - layout = GTK_LAYOUT (item->canvas); - bin_window = gtk_layout_get_bin_window (layout); - - text->gc = gdk_gc_new (bin_window); + text->gc = gdk_gc_new (item->canvas->layout.bin_window); } /* Unrealize handler for the text item */ |