updated to latest trunk

(bzr r14876.2.4)

1 files changed, 1 insertions, 12 deletions

diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 55ef0c5bb..9abad3e7b 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -11,13 +11,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <glibmm/main.h>
-#include <gtk/gtk.h>
 
 #include "floating-behavior.h"
 #include "dialog.h"
@@ -26,7 +24,6 @@
 #include "desktop.h"
 #include "ui/dialog-events.h"
 #include "ui/interface.h"
-#include "preferences.h"
 #include "verbs.h"
 
 namespace Inkscape {
@@ -140,11 +137,7 @@ FloatingBehavior::create(Dialog &dialog)
 inline FloatingBehavior::operator Gtk::Widget &()                          { return *_d; }
 inline GtkWidget *FloatingBehavior::gobj()                                { return GTK_WIDGET(_d->gobj()); }
 inline Gtk::Box* FloatingBehavior::get_vbox()                            { 
-#if WITH_GTKMM_3_0
     return _d->get_content_area();
-#else
-    return _d->get_vbox();
-#endif
 }
 inline void FloatingBehavior::present()                                   { _d->present(); }
 inline void FloatingBehavior::hide()                                      { _d->hide(); }
@@ -155,12 +148,8 @@ inline void FloatingBehavior::move(int x, int y)                          { _d->
 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) {
-#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); }