Fix orientable Gtkmm widgets

(bzr r13341.1.168)

2 files changed, 28 insertions, 3 deletions

diff --git a/src/live_effects/lpe-envelope-perspective.cpp b/src/live_effects/lpe-envelope-perspective.cpp
index 02cb67db3..5ada7a792 100644
--- a/src/live_effects/lpe-envelope-perspective.cpp
+++ b/src/live_effects/lpe-envelope-perspective.cpp
@@ -286,12 +286,20 @@ LPEEnvelopePerspective::newWidget()
                         Gtk::Label* handles = Gtk::manage(new Gtk::Label(Glib::ustring(_("Handles:")),Gtk::ALIGN_START));
                         vbox->pack_start(*handles, false, false, 2);
                         hboxUpHandles->pack_start(*widg, true, true, 2);
+#if WITH_GTKMM_3_0
+                        hboxUpHandles->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_EXPAND_WIDGET);
+#else
                         hboxUpHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET);
+#endif
                     }else if(param->param_key == "Up_Right_Point"){
                         hboxUpHandles->pack_start(*widg, true, true, 2);
                     }else if(param->param_key == "Down_Left_Point"){
                         hboxDownHandles->pack_start(*widg, true, true, 2);
+#if WITH_GTKMM_3_0
+                        hboxDownHandles->pack_start(*Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL)), Gtk::PACK_EXPAND_WIDGET);
+#else
                         hboxDownHandles->pack_start(*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_EXPAND_WIDGET);
+#endif
                     }else{
                         hboxDownHandles->pack_start(*widg, true, true, 2);
                     }
@@ -320,8 +328,13 @@ LPEEnvelopePerspective::newWidget()
     }
     vbox->pack_start(*hboxUpHandles,true, true, 2);
     Gtk::HBox * hboxMiddle = Gtk::manage(new Gtk::HBox(true,2));
+#if WITH_GTKMM_3_0
+    hboxMiddle->pack_start(*Gtk::manage(new Gtk::Separator()), Gtk::PACK_EXPAND_WIDGET);
+    hboxMiddle->pack_start(*Gtk::manage(new Gtk::Separator()), Gtk::PACK_EXPAND_WIDGET);
+#else
     hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET);
     hboxMiddle->pack_start(*Gtk::manage(new Gtk::HSeparator()), Gtk::PACK_EXPAND_WIDGET);
+#endif
     vbox->pack_start(*hboxMiddle, false, true, 2);
     vbox->pack_start(*hboxDownHandles, true, true, 2);
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false,0));
@@ -422,4 +435,4 @@ LPEEnvelopePerspective::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::v
   fill-column:99
   End:
 */
-// vim: file_type=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index 9af849530..5f6acd6f4 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -2,9 +2,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-
 #include "live_effects/lpe-roughen.h"
+#include <gtkmm/separator.h>
+
 #include "display/curve.h"
 #include "live_effects/parameter/parameter.h"
 #include "helper/geom.h"
@@ -82,7 +82,11 @@ Gtk::Widget *LPERoughen::newWidget() {
             Glib::ustring(_("<b>Roughen unit</b>")), Gtk::ALIGN_START));
         unitLabel->set_use_markup(true);
         vbox->pack_start(*unitLabel, false, false, 2);
+#if WITH_GTKMM_3_0
+        vbox->pack_start(*Gtk::manage(new Gtk::Separator()),
+#else
         vbox->pack_start(*Gtk::manage(new Gtk::HSeparator()),
+#endif
                          Gtk::PACK_EXPAND_WIDGET);
       }
       if (param->param_key == "method") {
@@ -91,7 +95,11 @@ Gtk::Widget *LPERoughen::newWidget() {
             Gtk::ALIGN_START));
         methodLabel->set_use_markup(true);
         vbox->pack_start(*methodLabel, false, false, 2);
+#if WITH_GTKMM_3_0
+        vbox->pack_start(*Gtk::manage(new Gtk::Separator()),
+#else
         vbox->pack_start(*Gtk::manage(new Gtk::HSeparator()),
+#endif
                          Gtk::PACK_EXPAND_WIDGET);
       }
       if (param->param_key == "displaceX") {
@@ -100,7 +108,11 @@ Gtk::Widget *LPERoughen::newWidget() {
             Gtk::ALIGN_START));
         displaceXLabel->set_use_markup(true);
         vbox->pack_start(*displaceXLabel, false, false, 2);
+#if WITH_GTKMM_3_0
+        vbox->pack_start(*Gtk::manage(new Gtk::Separator()),
+#else
         vbox->pack_start(*Gtk::manage(new Gtk::HSeparator()),
+#endif
                          Gtk::PACK_EXPAND_WIDGET);
       }
       Glib::ustring *tip = param->param_getTooltip();