diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-06 21:54:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-06 21:54:49 +0000 |
| commit | 60bc603d6d45cbc13d2dd8718908b63ba6b838ec (patch) | |
| tree | 3b13d684c5cd381a42f8247d7429e581c0a6afac /src | |
| parent | Fix missing glib headers in imageicon (diff) | |
| download | inkscape-60bc603d6d45cbc13d2dd8718908b63ba6b838ec.tar.gz inkscape-60bc603d6d45cbc13d2dd8718908b63ba6b838ec.zip | |
A couple of simple Gtk3 fixes
(bzr r11342)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/prefdialog.cpp | 8 | ||||
| -rw-r--r-- | src/ui/widget/color-preview.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp index 4fd5680aa..761126bd5 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog.cpp @@ -41,7 +41,11 @@ namespace Extension { them. It also places the passed in widgets into the dialog. */ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * controls, Effect * effect) : +#if WITH_GTKMM_3_0 + Gtk::Dialog::Dialog(_(name.c_str()), true), +#else Gtk::Dialog::Dialog(_(name.c_str()), true, true), +#endif _help(help), _name(name), _button_ok(NULL), @@ -97,7 +101,11 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co Gtk::Box * hbox = dynamic_cast<Gtk::Box *>(_button_preview); if (hbox != NULL) { +#if WITH_GTKMM_3_0 + Gtk::Widget * back = hbox->get_children().back(); +#else Gtk::Widget * back = hbox->children().back().get_widget(); +#endif Gtk::CheckButton * cb = dynamic_cast<Gtk::CheckButton *>(back); _checkbox_preview = cb; } diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp index 244e2b4e3..3ebb282ec 100644 --- a/src/ui/widget/color-preview.cpp +++ b/src/ui/widget/color-preview.cpp @@ -75,7 +75,7 @@ ColorPreview::paint (GdkRectangle *area) return; GtkWidget *widget = GTK_WIDGET(this->gobj()); - cairo_t *ct = gdk_cairo_create(widget->window); + cairo_t *ct = gdk_cairo_create(gtk_widget_get_window(widget)); /* Transparent area */ |