Update to experimental r13436

(bzr r13090.1.92)

3 files changed, 11 insertions, 14 deletions

diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index 104cbde98..1a02375cd 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -1,9 +1,9 @@
-#define INKSCAPE_LPE_SIMPLIFY_C
 /*
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <gtkmm/box.h>
-#include <gtkmm/entry.h>
+
+#include <gtkmm.h>
+
 #include "live_effects/lpe-simplify.h"
 #include "display/curve.h"
 #include "live_effects/parameter/parameter.h"
@@ -30,13 +30,13 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject)
             threshold(_("Roughly threshold:"), _("Roughly threshold:"), "threshold", &wr, this, 0.003),
             helper_size(_("Helper size:"), _("Helper size"), "helper_size", &wr, this, 2.),
             nodes(_("Helper nodes"), _("Show helper nodes"), "nodes", &wr, this, false,
-                  "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")),
+                  "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
             handles(_("Helper handles"), _("Show helper handles"), "handles", &wr, this, false,
-                    "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")),
+                    "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
             simplifyindividualpaths(_("Paths separately"), _("Simplifying paths (separately)"), "simplifyindividualpaths", &wr, this, false,
-                                    "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop")),
+                                    "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
             simplifyJustCoalesce(_("Just coalesce"), _("Simplify just coalesce"), "simplifyJustCoalesce", &wr, this, false,
-                                 "", INKSCAPE_ICON("system-run"), INKSCAPE_ICON("process-stop"))
+                                 "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off"))
             {
                 registerParameter(dynamic_cast<Parameter *>(&steps));
                 registerParameter(dynamic_cast<Parameter *>(&threshold));
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index d92b9836f..5658d238f 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -5,9 +5,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
-#include <gtkmm/widget.h>
+#include <gtkmm.h>
 #include <glibmm/i18n.h>
 
 #include "ui/widget/registered-widget.h"
@@ -97,12 +95,12 @@ ToggleButtonParam::param_newWidget()
             iconButton = sp_icon_new(iconSize, iconInactive);
         }
         gtk_widget_show(iconButton);
-        gtk_box_pack_start (GTK_BOX(boxButton), iconButton, true, true, 2);
+        gtk_box_pack_start (GTK_BOX(boxButton), iconButton, false, false, 1);
         if (!param_label.empty()) {
-            gtk_box_pack_start (GTK_BOX(boxButton), labelButton, true, true, 2);
+            gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1);
         }
     }else{
-        gtk_box_pack_start (GTK_BOX(boxButton), labelButton, true, true, 2);
+        gtk_box_pack_start (GTK_BOX(boxButton), labelButton, false, false, 1);
     }
     checkwdg->add(*Gtk::manage(Glib::wrap(boxButton)));
     checkwdg->setActive(value);
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index aead3ebc0..56bcbef0d 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1611,7 +1611,6 @@ void PenTool::_bspline_spiro_motion(bool shift){
                     this->p[2] = this->p[3];
             }else{
                 this->p[1] =  (*cubic)[3] + ((*cubic)[3] - (*cubic)[2] );
-                this->p[1] = Geom::Point(this->p[1][X] + 0.005,this->p[1][Y] + 0.005);
             }
         }else{
             this->p[1] = this->p[0];