summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-05-24 22:14:47 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-05-24 22:14:47 +0000
commita3c6dd9b0e7f276b0373943b4745f9dfe31d0130 (patch)
tree86c29c0b2a618f08f61390dfd1f079cc2e043f73 /src
parentGrDrag: check for null pointer (diff)
downloadinkscape-a3c6dd9b0e7f276b0373943b4745f9dfe31d0130.tar.gz
inkscape-a3c6dd9b0e7f276b0373943b4745f9dfe31d0130.zip
svg-canvas GTK+3 fixes
(bzr r11412)
Diffstat (limited to 'src')
-rw-r--r--src/ui/widget/svg-canvas.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ui/widget/svg-canvas.cpp b/src/ui/widget/svg-canvas.cpp
index a00c16f52..34724ece7 100644
--- a/src/ui/widget/svg-canvas.cpp
+++ b/src/ui/widget/svg-canvas.cpp
@@ -38,10 +38,22 @@ SVGCanvas::init (SPDesktop *dt)
_widget->set_can_focus();
// Set background to white
+#if WITH_GTKMM_3_0
+ // TODO: Use Gtk::StyleContext instead
+ GtkWidget *c_widget = _widget->gobj();
+ GtkStyle *style = gtk_widget_get_style(c_widget);
+ style->bg[GTK_STATE_NORMAL] = style->white;
+ gtk_widget_set_style(c_widget, style);
+#else
Glib::RefPtr<Gtk::Style> style = _widget->get_style();
style->set_bg(Gtk::STATE_NORMAL, style->get_white());
_widget->set_style(style);
+
+ // extension_events stuff is handled internally in GTK+ 3
+ // TODO: Needs testing
_widget->set_extension_events(Gdk::EXTENSION_EVENTS_ALL);
+#endif
+
_widget->signal_event().connect(sigc::mem_fun(*this, &SVGCanvas::onEvent));
}