From 019c87b20cd0b9c85268afaf389d7380b4dbce3c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 28 Apr 2012 16:49:30 +0100 Subject: gtkmm-3.0 fixes for Gtk::Box and header inclusions (bzr r11304) --- src/ui/dialog/floating-behavior.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/floating-behavior.cpp') 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); } -- cgit v1.2.3 From 7a38f66b0aefb8da58dd26ec51e4de53e8d1cf95 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 1 May 2012 00:08:33 +0100 Subject: Fix typos in Gtk3 fixes, and fix separator API usage (bzr r11309) --- src/ui/dialog/floating-behavior.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ui/dialog/floating-behavior.cpp') diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index e69eb956e..105dfa9c2 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -41,7 +41,6 @@ FloatingBehavior::FloatingBehavior(Dialog &dialog) : #endif { hide(); - _d->set_has_separator(false); signal_delete_event().connect(sigc::mem_fun(_dialog, &Inkscape::UI::Dialog::Dialog::_onDeleteEvent)); -- cgit v1.2.3 From 7cc39d46785b9e9b7b125cd14b5aa919fc33fe84 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 1 May 2012 00:25:29 +0100 Subject: Remove remaining ancient GTK+ version checks (bzr r11311) --- src/ui/dialog/floating-behavior.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/ui/dialog/floating-behavior.cpp') diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 105dfa9c2..ba81c6d47 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -32,13 +32,11 @@ namespace Behavior { FloatingBehavior::FloatingBehavior(Dialog &dialog) : Behavior(dialog), _d (new Gtk::Dialog(_dialog._title)) -#if GTK_VERSION_GE(2, 12) ,_dialog_active(_d->property_is_active()) ,_steps(0) ,_trans_focus(Inkscape::Preferences::get()->getDoubleLimited("/dialogs/transparency/on-focus", 0.95, 0.0, 1.0)) ,_trans_blur(Inkscape::Preferences::get()->getDoubleLimited("/dialogs/transparency/on-blur", 0.50, 0.0, 1.0)) ,_trans_time(Inkscape::Preferences::get()->getIntLimited("/dialogs/transparency/animate-time", 100, 0, 5000)) -#endif { hide(); @@ -47,14 +45,11 @@ FloatingBehavior::FloatingBehavior(Dialog &dialog) : sp_transientize(GTK_WIDGET(_d->gobj())); _dialog.retransientize_suppress = false; -#if GTK_VERSION_GE(2, 12) _focus_event(); _dialog_active.signal_changed().connect(sigc::mem_fun(this, &FloatingBehavior::_focus_event)); -#endif } -#if GTK_VERSION_GE(2, 12) /** * A function called when the window gets focus. * @@ -125,8 +120,6 @@ bool FloatingBehavior::_trans_timer (void) { return true; } -#endif - FloatingBehavior::~FloatingBehavior() { delete _d; -- cgit v1.2.3