diff options
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/error-file.cpp | 2 | ||||
| -rw-r--r-- | src/extension/implementation/script.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/bool.cpp | 1 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 8 | ||||
| -rw-r--r-- | src/extension/prefdialog.cpp | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 5a3f8dcd2..2a56f55e8 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -56,7 +56,7 @@ ErrorFileNotice::ErrorFileNotice (void) : g_free(ext_error_file); set_message(dialog_text, true); - Gtk::VBox * vbox = get_vbox(); + Gtk::Box * vbox = get_vbox(); /* This is some filler text, needs to change before relase */ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index d7dd641b0..7db036477 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -851,7 +851,7 @@ void Script::checkStderr (const Glib::ustring &data, GtkWidget *dlg = GTK_WIDGET(warning.gobj()); sp_transientize(dlg); - Gtk::VBox * vbox = warning.get_vbox(); + Gtk::Box * vbox = warning.get_vbox(); /* Gtk::TextView * textview = new Gtk::TextView(Gtk::TextBuffer::create()); */ Gtk::TextView * textview = new Gtk::TextView(); diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index f7c4e6c0c..abef8d8f3 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -13,6 +13,7 @@ #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> +#include <gtkmm/checkbutton.h> #include "xml/node.h" #include "../extension.h" diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 9c8475e2d..d71d60ebd 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -20,6 +20,7 @@ #include <gtkmm/box.h> #include <gtkmm/comboboxtext.h> +#include <gtkmm/radiobutton.h> #include <glibmm/i18n.h> #include "xml/node.h" @@ -273,8 +274,15 @@ Gtk::Widget * ParamRadioButton::get_widget(SPDocument * doc, Inkscape::XML::Node return NULL; } +#if WITH_GTKMM_3_0 + Gtk::Box * hbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4)); + hbox->set_homogeneous(false); + Gtk::Box * vbox = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL, 0)); + vbox->set_homogeneous(false); +#else Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox(false, 0)); +#endif #if WITH_GTKMM_2_22 Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START, Gtk::ALIGN_START)); diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp index 7d42c109a..4fd5680aa 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog.cpp @@ -95,7 +95,7 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co hbox->show(); this->get_vbox()->pack_start(*hbox, true, true, 6); - Gtk::HBox * hbox = dynamic_cast<Gtk::HBox *>(_button_preview); + Gtk::Box * hbox = dynamic_cast<Gtk::Box *>(_button_preview); if (hbox != NULL) { Gtk::Widget * back = hbox->children().back().get_widget(); Gtk::CheckButton * cb = dynamic_cast<Gtk::CheckButton *>(back); |
