Ported "widgets/stroke-style.*".

(bzr r12380.1.44)

1 files changed, 16 insertions, 8 deletions

diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index fd9940db1..440881c6d 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -40,8 +40,6 @@
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "helper/stock-items.h"
-#include "helper/unit-menu.h"
-#include "helper/units.h"
 #include "inkscape.h"
 #include "io/sys.h"
 #include "marker.h"
@@ -77,6 +75,17 @@ class Widget;
 class Container;
 }
 
+namespace Inkscape {
+    namespace Util {
+        class Unit;
+    }
+    namespace UI {
+        namespace Widget {
+            class UnitMenu;
+        }
+    }
+}
+
 struct { gchar const *key; gint value; } const SPMarkerNames[] = {
     {"marker-all", SP_MARKER_LOC},
     {"marker-start", SP_MARKER_LOC_START},
@@ -162,17 +171,13 @@ private:
                                         StrokeStyleButtonType  button_type,
                                         gchar const           *stroke_style);
 
-    static gboolean setStrokeWidthUnit(SPUnitSelector *,
-                                          SPUnit const *old,
-                                          SPUnit const *new_units,
-                                          StrokeStyle *spw);
-
     // Callback functions
     void selectionModifiedCB(guint flags);
     void selectionChangedCB();
     void widthChangedCB();
     void miterLimitChangedCB();
     void lineDashChangedCB();
+    void unitChangedCB();
     static void markerSelectCB(MarkerComboBox *marker_combo, StrokeStyle *spw, SPMarkerLoc const which);
     static void buttonToggledCB(StrokeStyleButton *tb, StrokeStyle *spw);
 
@@ -191,7 +196,7 @@ private:
 #endif
     Inkscape::UI::Widget::SpinButton *miterLimitSpin;
     Inkscape::UI::Widget::SpinButton *widthSpin;
-    GtkWidget *unitSelector;
+    Inkscape::UI::Widget::UnitMenu *unitSelector;
     StrokeStyleButton *joinMiter;
     StrokeStyleButton *joinRound;
     StrokeStyleButton *joinBevel;
@@ -207,6 +212,9 @@ private:
     sigc::connection startMarkerConn;
     sigc::connection midMarkerConn;
     sigc::connection endMarkerConn;
+    sigc::connection unitChangedConn;
+    
+    Inkscape::Util::Unit *_old_unit;
 };
 
 } // namespace Inkscape