diff options
29 files changed, 64 insertions, 24 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); diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index 117a2cad9..c9ab7b21d 100644 --- a/src/libnrtype/font-lister.h +++ b/src/libnrtype/font-lister.h @@ -14,6 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <map> #include <gtkmm/liststore.h> #include <gtkmm/treemodelcolumn.h> #include <gtkmm/treepath.h> diff --git a/src/ui/dialog/behavior.h b/src/ui/dialog/behavior.h index 385cd05f5..5d5519a03 100644 --- a/src/ui/dialog/behavior.h +++ b/src/ui/dialog/behavior.h @@ -45,7 +45,7 @@ public: virtual operator Gtk::Widget&() =0; virtual GtkWidget *gobj() =0; virtual void present() =0; - virtual Gtk::VBox *get_vbox() =0; + virtual Gtk::Box *get_vbox() =0; virtual void show() =0; virtual void hide() =0; virtual void show_all_children() =0; diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp index da3b5a802..c6633df0b 100644 --- a/src/ui/dialog/calligraphic-profile-rename.cpp +++ b/src/ui/dialog/calligraphic-profile-rename.cpp @@ -30,7 +30,7 @@ namespace Dialog { CalligraphicProfileRename::CalligraphicProfileRename() : _applied(false) { - Gtk::VBox *mainVBox = get_vbox(); + Gtk::Box *mainVBox = get_vbox(); _layout_table.set_spacings(4); _layout_table.resize (1, 2); diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 8ffbd5c52..7095d2611 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -69,7 +69,7 @@ DebugDialogImpl::DebugDialogImpl() set_title(_("Messages")); set_size_request(300, 400); - Gtk::VBox *mainVBox = get_vbox(); + Gtk::Box *mainVBox = get_vbox(); //## Add a menu for clear() menuBar.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_File"), fileMenu) ); diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index 5979cbb9e..14a26b716 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -160,7 +160,7 @@ void Dialog::onShowF12() inline Dialog::operator Gtk::Widget &() { return *_behavior; } inline GtkWidget *Dialog::gobj() { return _behavior->gobj(); } inline void Dialog::present() { _behavior->present(); } -inline Gtk::VBox *Dialog::get_vbox() { return _behavior->get_vbox(); } +inline Gtk::Box *Dialog::get_vbox() { return _behavior->get_vbox(); } inline void Dialog::hide() { _behavior->hide(); } inline void Dialog::show() { _behavior->show(); } inline void Dialog::show_all_children() { _behavior->show_all_children(); } diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h index 390649c91..025e9eb58 100644 --- a/src/ui/dialog/dialog.h +++ b/src/ui/dialog/dialog.h @@ -79,7 +79,7 @@ public: virtual operator Gtk::Widget &(); virtual GtkWidget *gobj(); virtual void present(); - virtual Gtk::VBox *get_vbox(); + virtual Gtk::Box *get_vbox(); virtual void show(); virtual void hide(); virtual void show_all_children(); diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index d40edd67d..4caa106ad 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -21,6 +21,7 @@ #include <gtkmm/filechooserdialog.h> #include <glib/gstdio.h> #include <gtkmm/comboboxtext.h> +#include <gtkmm/checkbutton.h> //General includes #include <unistd.h> diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index dd3e90b2c..a887c433f 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -62,6 +62,7 @@ #include "io/sys.h" #include <iostream> +#include <gtkmm/checkbutton.h> #include <gtkmm/colorbutton.h> #include <gtkmm/paned.h> #include <gtkmm/scrolledwindow.h> diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 6748665ad..e69eb956e 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -142,7 +142,7 @@ FloatingBehavior::create(Dialog &dialog) inline FloatingBehavior::operator Gtk::Widget &() { return *_d; } inline GtkWidget *FloatingBehavior::gobj() { return GTK_WIDGET(_d->gobj()); } -inline Gtk::VBox* FloatingBehavior::get_vbox() { return _d->get_vbox(); } +inline Gtk::Box* FloatingBehavior::get_vbox() { return _d->get_vbox(); } inline void FloatingBehavior::present() { _d->present(); } inline void FloatingBehavior::hide() { _d->hide(); } inline void FloatingBehavior::show() { _d->show(); } @@ -151,7 +151,14 @@ inline void FloatingBehavior::resize(int width, int height) { _d-> inline void FloatingBehavior::move(int x, int y) { _d->move(x, y); } inline void FloatingBehavior::set_position(Gtk::WindowPosition position) { _d->set_position(position); } inline void FloatingBehavior::set_size_request(int width, int height) { _d->set_size_request(width, height); } -inline void FloatingBehavior::size_request(Gtk::Requisition &requisition) {requisition = _d->size_request(); } +inline void FloatingBehavior::size_request(Gtk::Requisition &requisition) { +#if WITH_GTKMM_3_0 + Gtk::Requisition requisition_natural; + _d->get_preferred_size(requisition, requisition_natural); +#else + requisition = _d->size_request(); +#endif +} inline void FloatingBehavior::get_position(int &x, int &y) { _d->get_position(x, y); } inline void FloatingBehavior::get_size(int &width, int &height) { _d->get_size(width, height); } inline void FloatingBehavior::set_title(Glib::ustring title) { _d->set_title(title); } diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h index c6b6a93e9..7059f0a86 100644 --- a/src/ui/dialog/floating-behavior.h +++ b/src/ui/dialog/floating-behavior.h @@ -36,7 +36,7 @@ public: operator Gtk::Widget &(); GtkWidget *gobj(); void present(); - Gtk::VBox *get_vbox(); + Gtk::Box *get_vbox(); void show(); void hide(); void show_all_children(); diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index ce21f9c6e..d20f2a220 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -166,7 +166,7 @@ void GuidelinePropertiesDialog::_setup() { add_button(Gtk::Stock::DELETE, -12); add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - Gtk::VBox *mainVBox = get_vbox(); + Gtk::Box *mainVBox = get_vbox(); _layout_table.set_spacings(4); _layout_table.resize (3, 4); diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index f292ad565..4fd792407 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -36,7 +36,7 @@ namespace Dialogs { LayerPropertiesDialog::LayerPropertiesDialog() : _strategy(NULL), _desktop(NULL), _layer(NULL), _position_visible(false) { - Gtk::VBox *mainVBox = get_vbox(); + Gtk::Box *mainVBox = get_vbox(); _layout_table.set_spacings(4); _layout_table.resize (1, 2); diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index 36a9f06a3..c22aace37 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -72,7 +72,7 @@ LivePathEffectAdd::LivePathEffectAdd() : add_button.set_use_underline(true); add_button.set_can_default(); - Gtk::VBox *mainVBox = get_vbox(); + Gtk::Box *mainVBox = get_vbox(); mainVBox->pack_start(scrolled_window, true, true); add_action_widget(close_button, Gtk::RESPONSE_CLOSE); add_action_widget(add_button, Gtk::RESPONSE_APPLY); diff --git a/src/ui/dialog/messages.h b/src/ui/dialog/messages.h index 350c1feec..6ed246ece 100644 --- a/src/ui/dialog/messages.h +++ b/src/ui/dialog/messages.h @@ -19,6 +19,7 @@ #include <gtkmm/box.h> #include <gtkmm/textview.h> #include <gtkmm/button.h> +#include <gtkmm/checkbutton.h> #include <gtkmm/menubar.h> #include <gtkmm/menu.h> #include <gtkmm/scrolledwindow.h> diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index 1e44e23a1..1fefd811e 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -154,7 +154,7 @@ PanelDialog<B>::PanelDialog(Widget::Panel &panel, char const *prefs_path, int co PanelDialogBase(panel, prefs_path, verb_num, apply_label), Dialog(&B::create, prefs_path, verb_num, apply_label) { - Gtk::VBox *vbox = get_vbox(); + Gtk::Box *vbox = get_vbox(); _panel.signalResponse().connect(sigc::mem_fun(*this, &PanelDialog::_handleResponse)); _panel.signalPresent().connect(sigc::mem_fun(*this, &PanelDialog::_presentDialog)); @@ -204,7 +204,7 @@ PanelDialog<Behavior::FloatingBehavior>::PanelDialog(UI::Widget::Panel &panel, c PanelDialogBase(panel, prefs_path, verb_num, apply_label), Dialog(&Behavior::FloatingBehavior::create, prefs_path, verb_num, apply_label) { - Gtk::VBox *vbox = get_vbox(); + Gtk::Box *vbox = get_vbox(); _panel.signalResponse().connect(sigc::mem_fun(*this, &PanelDialog::_handleResponse)); vbox->pack_start(_panel, true, true, 0); diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h index d94464517..ee7941580 100644 --- a/src/ui/dialog/undo-history.h +++ b/src/ui/dialog/undo-history.h @@ -16,6 +16,7 @@ #include <gtkmm/scrolledwindow.h> #include <gtkmm/treemodel.h> #include <gtkmm/treeselection.h> +#include <glibmm/property.h> #include <functional> #include <sstream> diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index 11f73ce43..d89df1104 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -208,8 +208,9 @@ void PreviewHolder::on_size_allocate( Gtk::Allocation& allocation ) if ( _insides && !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) { Gtk::Requisition req; -#if WITH_GTKMM_3_0 - _insides->get_preferred_size(&req, NULL); +#if GTK_CHECK_VERSION(3,0,0) + Gtk::Requisition req_natural; + _insides->get_preferred_size(req, req_natural); #else req = _insides->size_request(); #endif @@ -239,8 +240,9 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int& if ( _anchor == SP_ANCHOR_SOUTH || _anchor == SP_ANCHOR_NORTH ) { Gtk::Requisition req; -#if WITH_GTKMM_3_0 - _scroller->get_preferred_size(&req, NULL); +#if GTK_CHECK_VERSION(3,0,0) + Gtk::Requisition req_natural; + _scroller->get_preferred_size(req, req_natural); #else req = _scroller->size_request(); #endif @@ -249,11 +251,17 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int& req.width = currW; } +#if GTK_CHECK_VERSION(3,0,0) + Gtk::Scrollbar* hs = dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->get_hscrollbar(); +#else Gtk::HScrollbar* hs = dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->get_hscrollbar(); +#endif + if ( hs ) { Gtk::Requisition scrollReq; -#if WITH_GTKMM_3_0 - hs->get_preferred_size(&scrollReq, NULL); +#if GTK_CHECK_VERSION(3,0,0) + Gtk::Requisition scrollReq_natural; + hs->get_preferred_size(scrollReq, scrollReq_natural); #else scrollReq = hs->size_request(); #endif @@ -263,8 +271,9 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int& } Gtk::Requisition req2; -#if WITH_GTKMM_3_0 - const_cast<Gtk::Widget*>(thing)->get_preferred_size(&req2, NULL); +#if GTK_CHECK_VERSION(3,0,0) + Gtk::Requisition req2_natural; + const_cast<Gtk::Widget*>(thing)->get_preferred_size(req2, req2_natural); #else req2 = const_cast<Gtk::Widget*>(thing)->size_request(); #endif diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index 54446230e..6389ce8af 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -10,6 +10,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <glibmm/property.h> #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 45c4e5f07..b40bb75cd 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -20,6 +20,8 @@ #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <gtkmm/menu.h> #include <gtkmm/stock.h> +#include <gtkmm/radiobutton.h> +#include <gtkmm/radiomenuitem.h> #include <gtk/gtk.h> diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index aad880ec7..874e0958a 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -21,6 +21,8 @@ #include "ui/widget/spinbutton.h" #include <stddef.h> #include <sigc++/sigc++.h> +#include <gtkmm/checkbutton.h> +#include <gtkmm/radiobutton.h> #include <gtkmm/comboboxtext.h> #include <gtkmm/drawingarea.h> #include <gtkmm/scale.h> diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 747de4681..ea2bac867 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -18,6 +18,7 @@ #endif #include "registered-widget.h" +#include <gtkmm/radiobutton.h> #include "ui/widget/color-picker.h" #include "ui/widget/registry.h" diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index 0fe516321..76a6a1595 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -19,6 +19,8 @@ #include <gtkmm/menu.h> #include <gtkmm/menuitem.h> #include <gtkmm/adjustment.h> +#include <gtkmm/radiobuttongroup.h> +#include <gtkmm/radiomenuitem.h> #include "ui/widget/spinbutton.h" #include <stddef.h> diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h index c21b819ca..5078c1092 100644 --- a/src/ui/widget/spin-slider.h +++ b/src/ui/widget/spin-slider.h @@ -13,6 +13,7 @@ #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/scale.h> +#include <gtkmm/togglebutton.h> #include "spinbutton.h" #include "attr-widget.h" diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 2e56dd696..db378ef4d 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -18,6 +18,7 @@ #define noSP_SS_VERBOSE #include "widgets/dash-selector.h" +#include <gtkmm/radiobutton.h> #include <gtkmm/table.h> #include <glibmm/i18n.h> |