Adopt obsolete GtkAnchorType enum as SPAnchorType

(bzr r11207)

28 files changed, 149 insertions, 119 deletions

diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index cf8d73bd2..d3ad81134 100644
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -620,7 +620,7 @@ cc_select_handle(SPKnot* knot)
 {
     knot->setShape(SP_KNOT_SHAPE_SQUARE);
     knot->setSize(10);
-    knot->setAnchor(GTK_ANCHOR_CENTER);
+    knot->setAnchor(SP_ANCHOR_CENTER);
     knot->setFill(0x0000ffff, 0x0000ffff, 0x0000ffff);
     sp_knot_update_ctrl(knot);
 }
@@ -630,7 +630,7 @@ cc_deselect_handle(SPKnot* knot)
 {
     knot->setShape(SP_KNOT_SHAPE_SQUARE);
     knot->setSize(8);
-    knot->setAnchor(GTK_ANCHOR_CENTER);
+    knot->setAnchor(SP_ANCHOR_CENTER);
     knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
     sp_knot_update_ctrl(knot);
 }
@@ -1637,7 +1637,7 @@ static void cc_active_shape_add_knot(SPDesktop* desktop, SPItem* item, Connectio
 
         knot->setShape(SP_KNOT_SHAPE_SQUARE);
         knot->setSize(8);
-        knot->setAnchor(GTK_ANCHOR_CENTER);
+        knot->setAnchor(SP_ANCHOR_CENTER);
         knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
         sp_knot_update_ctrl(knot);
 
@@ -1821,7 +1821,7 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item)
 
             knot->setShape(SP_KNOT_SHAPE_SQUARE);
             knot->setSize(7);
-            knot->setAnchor(GTK_ANCHOR_CENTER);
+            knot->setAnchor(SP_ANCHOR_CENTER);
             knot->setFill(0xffffff00, 0xff0000ff, 0xff0000ff);
             knot->setStroke(0x000000ff, 0x000000ff, 0x000000ff);
             sp_knot_update_ctrl(knot);
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index d5b8ce07f..1dd3022c7 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -23,6 +23,7 @@
 #include "preferences.h"
 #include <glibmm/i18n.h>
 #include "tools-switch.h"
+#include "enums.h"
 
 namespace Inkscape {
 namespace Display {
@@ -245,7 +246,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
         SPCanvasItem * canvasitem = NULL;
         canvasitem = sp_canvas_item_new(sp_desktop_tempgroup (_desktop),
                                         SP_TYPE_CTRL,
-                                        "anchor", GTK_ANCHOR_CENTER,
+                                        "anchor", SP_ANCHOR_CENTER,
                                         "size", 10.0,
                                         "stroked", TRUE,
                                         "stroke_color", pre_snap ? 0x7f7f7fff : 0xff0000ff,
@@ -345,7 +346,7 @@ SnapIndicator::set_new_snapsource(Inkscape::SnapCandidatePoint const &p)
     if (value) {
         SPCanvasItem * canvasitem = sp_canvas_item_new( sp_desktop_tempgroup (_desktop),
                                                         SP_TYPE_CTRL,
-                                                        "anchor", GTK_ANCHOR_CENTER,
+                                                        "anchor", SP_ANCHOR_CENTER,
                                                         "size", 6.0,
                                                         "stroked", TRUE,
                                                         "stroke_color", 0xff0000ff,
@@ -364,7 +365,7 @@ SnapIndicator::set_new_debugging_point(Geom::Point const &p)
     g_assert(_desktop != NULL);
     SPCanvasItem * canvasitem = sp_canvas_item_new( sp_desktop_tempgroup (_desktop),
                                                     SP_TYPE_CTRL,
-                                                    "anchor", GTK_ANCHOR_CENTER,
+                                                    "anchor", SP_ANCHOR_CENTER,
                                                     "size", 10.0,
                                                     "fill_color", 0x00ff00ff,
                                                     "stroked", FALSE,
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index a82aa8622..c5a1b10a2 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -74,7 +74,7 @@ sp_ctrl_class_init (SPCtrlClass *klass)
 
     gtk_object_add_arg_type ("SPCtrl::shape", G_TYPE_INT, G_PARAM_READWRITE, ARG_SHAPE);
     gtk_object_add_arg_type ("SPCtrl::mode", G_TYPE_INT, G_PARAM_READWRITE, ARG_MODE);
-    gtk_object_add_arg_type ("SPCtrl::anchor", GTK_TYPE_ANCHOR_TYPE, G_PARAM_READWRITE, ARG_ANCHOR);
+    gtk_object_add_arg_type ("SPCtrl::anchor", G_TYPE_INT, G_PARAM_READWRITE, ARG_ANCHOR);
     gtk_object_add_arg_type ("SPCtrl::size", G_TYPE_DOUBLE, G_PARAM_READWRITE, ARG_SIZE);
     gtk_object_add_arg_type ("SPCtrl::pixbuf", G_TYPE_POINTER, G_PARAM_READWRITE, ARG_PIXBUF);
     gtk_object_add_arg_type ("SPCtrl::filled", G_TYPE_BOOLEAN, G_PARAM_READWRITE, ARG_FILLED);
@@ -95,7 +95,7 @@ sp_ctrl_init (SPCtrl *ctrl)
 {
     ctrl->shape = SP_CTRL_SHAPE_SQUARE;
     ctrl->mode = SP_CTRL_MODE_COLOR;
-    ctrl->anchor = GTK_ANCHOR_CENTER;
+    ctrl->anchor = SP_ANCHOR_CENTER;
     ctrl->span = 3;
     ctrl->defined = TRUE;
     ctrl->shown = FALSE;
@@ -161,7 +161,7 @@ sp_ctrl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
             break;
 
         case ARG_ANCHOR:
-            ctrl->anchor = (GtkAnchorType)(GTK_VALUE_INT (*arg));
+            ctrl->anchor = (SPAnchorType)(GTK_VALUE_INT (*arg));
             ctrl->build = FALSE;
             sp_canvas_item_request_update (item);
             break;
@@ -240,39 +240,39 @@ sp_ctrl_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int fla
     y = (gint) ((affine[5] > 0) ? (affine[5] + 0.5) : (affine[5] - 0.5)) - ctrl->span;
 
     switch (ctrl->anchor) {
-        case GTK_ANCHOR_N:
-        case GTK_ANCHOR_CENTER:
-        case GTK_ANCHOR_S:
+        case SP_ANCHOR_N:
+        case SP_ANCHOR_CENTER:
+        case SP_ANCHOR_S:
             break;
 
-        case GTK_ANCHOR_NW:
-        case GTK_ANCHOR_W:
-        case GTK_ANCHOR_SW:
+        case SP_ANCHOR_NW:
+        case SP_ANCHOR_W:
+        case SP_ANCHOR_SW:
             x += ctrl->span;
             break;
 
-        case GTK_ANCHOR_NE:
-        case GTK_ANCHOR_E:
-        case GTK_ANCHOR_SE:
+        case SP_ANCHOR_NE:
+        case SP_ANCHOR_E:
+        case SP_ANCHOR_SE:
             x -= (ctrl->span + 1);
             break;
     }
 
     switch (ctrl->anchor) {
-        case GTK_ANCHOR_W:
-        case GTK_ANCHOR_CENTER:
-        case GTK_ANCHOR_E:
+        case SP_ANCHOR_W:
+        case SP_ANCHOR_CENTER:
+        case SP_ANCHOR_E:
             break;
 
-        case GTK_ANCHOR_NW:
-        case GTK_ANCHOR_N:
-        case GTK_ANCHOR_NE:
+        case SP_ANCHOR_NW:
+        case SP_ANCHOR_N:
+        case SP_ANCHOR_NE:
             y += ctrl->span;
             break;
 
-        case GTK_ANCHOR_SW:
-        case GTK_ANCHOR_S:
-        case GTK_ANCHOR_SE:
+        case SP_ANCHOR_SW:
+        case SP_ANCHOR_S:
+        case SP_ANCHOR_SE:
             y -= (ctrl->span + 1);
             break;
     }
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index 2617e7db2..cd0fcadf1 100644
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -7,9 +7,9 @@
  *
  */
 
-#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "sp-canvas-item.h"
+#include "enums.h"
 
 
 #define SP_TYPE_CTRL            (sp_ctrl_get_type ())
@@ -36,7 +36,7 @@ typedef enum {
 struct SPCtrl : public SPCanvasItem {
     SPCtrlShapeType shape;
     SPCtrlModeType mode;
-    GtkAnchorType anchor;
+    SPAnchorType anchor;
     gint span;
     guint defined : 1;
     guint shown   : 1;
diff --git a/src/enums.h b/src/enums.h
index 8b9dcc71f..2a30fc4a8 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -12,6 +12,28 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+/* Anchor types (imported from Gtk) */
+typedef enum
+{
+  SP_ANCHOR_CENTER,
+  SP_ANCHOR_NORTH,
+  SP_ANCHOR_NORTH_WEST,
+  SP_ANCHOR_NORTH_EAST,
+  SP_ANCHOR_SOUTH,
+  SP_ANCHOR_SOUTH_WEST,
+  SP_ANCHOR_SOUTH_EAST,
+  SP_ANCHOR_WEST,
+  SP_ANCHOR_EAST,
+  SP_ANCHOR_N		= SP_ANCHOR_NORTH,
+  SP_ANCHOR_NW		= SP_ANCHOR_NORTH_WEST,
+  SP_ANCHOR_NE		= SP_ANCHOR_NORTH_EAST,
+  SP_ANCHOR_S		= SP_ANCHOR_SOUTH,
+  SP_ANCHOR_SW		= SP_ANCHOR_SOUTH_WEST,
+  SP_ANCHOR_SE		= SP_ANCHOR_SOUTH_EAST,
+  SP_ANCHOR_W		= SP_ANCHOR_WEST,
+  SP_ANCHOR_E		= SP_ANCHOR_EAST
+} SPAnchorType;
+
 /* preserveAspectRatio */
 
 enum {
diff --git a/src/knot.cpp b/src/knot.cpp
index 4da9f01ee..770618470 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -193,7 +193,7 @@ static void sp_knot_init(SPKnot *knot)
     knot->size = 8;
     knot->pos = Geom::Point(0, 0);
     knot->grabbed_rel_pos = Geom::Point(0, 0);
-    knot->anchor = GTK_ANCHOR_CENTER;
+    knot->anchor = SP_ANCHOR_CENTER;
     knot->shape = SP_KNOT_SHAPE_SQUARE;
     knot->mode = SP_KNOT_MODE_XOR;
     knot->tip = NULL;
@@ -480,7 +480,7 @@ SPKnot *sp_knot_new(SPDesktop *desktop, const gchar *tip)
 
     knot->item = sp_canvas_item_new(sp_desktop_controls (desktop),
                                     SP_TYPE_CTRL,
-                                    "anchor", GTK_ANCHOR_CENTER,
+                                    "anchor", SP_ANCHOR_CENTER,
                                     "size", 8.0,
                                     "filled", TRUE,
                                     "fill_color", 0xffffff00,
diff --git a/src/knot.h b/src/knot.h
index 02f21c917..c0d2f68e4 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -15,11 +15,12 @@
  */
 
 #include <gdk/gdk.h>
-#include <gtk/gtk.h>
 #include <2geom/point.h>
 #include "knot-enums.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
+#include "enums.h"
+#include <gtk/gtk.h>
 
 class SPDesktop;
 class SPKnot;
@@ -32,6 +33,7 @@ struct SPCanvasItem;
 #define SP_IS_KNOT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_KNOT))
 #define SP_IS_KNOT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_KNOT))
 
+
 /**
  * Desktop-bound visual control object.
  *
@@ -47,7 +49,7 @@ struct SPKnot : GObject {
     Geom::Point pos;   /**< Our desktop coordinates. */
     Geom::Point grabbed_rel_pos;  /**< Grabbed relative position. */
     Geom::Point drag_origin;      /**< Origin of drag. */
-    GtkAnchorType anchor;    /**< Anchor. */
+    SPAnchorType anchor;    /**< Anchor. */
 
     SPKnotShapeType shape;   /**< Shape type. */
     SPKnotModeType mode;
@@ -80,7 +82,7 @@ struct SPKnot : GObject {
     //TODO: all the members above should eventualle become private, accessible via setters/getters
     inline void setSize (guint i) {size = i;}
     inline void setShape (guint i) {shape = (SPKnotShapeType) i;}
-    inline void setAnchor (guint i) {anchor = (GtkAnchorType) i;}
+    inline void setAnchor (guint i) {anchor = (SPAnchorType) i;}
     inline void setMode (guint i) {mode = (SPKnotModeType) i;}
     inline void setPixbuf (gpointer p) {pixbuf = p;}
     inline void setFill (guint32 normal, guint32 mouseover, guint32 dragging) {
diff --git a/src/measure-context.cpp b/src/measure-context.cpp
index 9db2b8de4..3237bb3fb 100644
--- a/src/measure-context.cpp
+++ b/src/measure-context.cpp
@@ -40,6 +40,7 @@
 #include <2geom/angle.h>
 #include "snap.h"
 #include "sp-namedview.h"
+#include "enums.h"
 
 
 static void sp_measure_context_class_init(SPMeasureContextClass *klass);
@@ -351,7 +352,7 @@ static gint sp_measure_context_root_handler(SPEventContext *event_context, GdkEv
                     SPCanvasItem * canvasitem = NULL;
                     canvasitem = sp_canvas_item_new(sp_desktop_tempgroup(desktop),
                                                     SP_TYPE_CTRL,
-                                                    "anchor", GTK_ANCHOR_CENTER,
+                                                    "anchor", SP_ANCHOR_CENTER,
                                                     "size", 8.0,
                                                     "stroked", TRUE,
                                                     "stroke_color", 0xff0000ff,
diff --git a/src/seltrans-handles.cpp b/src/seltrans-handles.cpp
index 10b87aaff..fc03789d6 100644
--- a/src/seltrans-handles.cpp
+++ b/src/seltrans-handles.cpp
@@ -3,29 +3,29 @@
 
 SPSelTransHandle const handles_scale[] = {
 //anchor         cursor                   control  action                request                       x    y
- {GTK_ANCHOR_SE, GDK_TOP_LEFT_CORNER,     0,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   0,   1},
- {GTK_ANCHOR_S,  GDK_TOP_SIDE,            3,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0.5, 1},
- {GTK_ANCHOR_SW, GDK_TOP_RIGHT_CORNER,    1,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   1,   1},
- {GTK_ANCHOR_W,  GDK_RIGHT_SIDE,          2,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 1,   0.5},
- {GTK_ANCHOR_NW, GDK_BOTTOM_RIGHT_CORNER, 0,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   1,   0},
- {GTK_ANCHOR_N,  GDK_BOTTOM_SIDE,         3,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0.5, 0},
- {GTK_ANCHOR_NE, GDK_BOTTOM_LEFT_CORNER,  1,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   0,   0},
- {GTK_ANCHOR_E,  GDK_LEFT_SIDE,           2,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0,   0.5}
+ {SP_ANCHOR_SE, GDK_TOP_LEFT_CORNER,     0,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   0,   1},
+ {SP_ANCHOR_S,  GDK_TOP_SIDE,            3,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0.5, 1},
+ {SP_ANCHOR_SW, GDK_TOP_RIGHT_CORNER,    1,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   1,   1},
+ {SP_ANCHOR_W,  GDK_RIGHT_SIDE,          2,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 1,   0.5},
+ {SP_ANCHOR_NW, GDK_BOTTOM_RIGHT_CORNER, 0,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   1,   0},
+ {SP_ANCHOR_N,  GDK_BOTTOM_SIDE,         3,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0.5, 0},
+ {SP_ANCHOR_NE, GDK_BOTTOM_LEFT_CORNER,  1,       sp_sel_trans_scale,   sp_sel_trans_scale_request,   0,   0},
+ {SP_ANCHOR_E,  GDK_LEFT_SIDE,           2,       sp_sel_trans_stretch, sp_sel_trans_stretch_request, 0,   0.5}
 };
 
 SPSelTransHandle const handles_rotate[] = {
- {GTK_ANCHOR_SE, GDK_EXCHANGE,            4,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  0,   1},
- {GTK_ANCHOR_S,  GDK_SB_H_DOUBLE_ARROW,   5,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    0.5, 1},
- {GTK_ANCHOR_SW, GDK_EXCHANGE,            6,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  1,   1},
- {GTK_ANCHOR_W,  GDK_SB_V_DOUBLE_ARROW,   7,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    1,   0.5},
- {GTK_ANCHOR_NW, GDK_EXCHANGE,            8,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  1,   0},
- {GTK_ANCHOR_N,  GDK_SB_H_DOUBLE_ARROW,   9,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    0.5, 0},
- {GTK_ANCHOR_NE, GDK_EXCHANGE,            10,      sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  0,   0},
- {GTK_ANCHOR_E,  GDK_SB_V_DOUBLE_ARROW,   11,      sp_sel_trans_skew,    sp_sel_trans_skew_request,    0,   0.5}
+ {SP_ANCHOR_SE, GDK_EXCHANGE,            4,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  0,   1},
+ {SP_ANCHOR_S,  GDK_SB_H_DOUBLE_ARROW,   5,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    0.5, 1},
+ {SP_ANCHOR_SW, GDK_EXCHANGE,            6,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  1,   1},
+ {SP_ANCHOR_W,  GDK_SB_V_DOUBLE_ARROW,   7,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    1,   0.5},
+ {SP_ANCHOR_NW, GDK_EXCHANGE,            8,       sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  1,   0},
+ {SP_ANCHOR_N,  GDK_SB_H_DOUBLE_ARROW,   9,       sp_sel_trans_skew,    sp_sel_trans_skew_request,    0.5, 0},
+ {SP_ANCHOR_NE, GDK_EXCHANGE,            10,      sp_sel_trans_rotate,  sp_sel_trans_rotate_request,  0,   0},
+ {SP_ANCHOR_E,  GDK_SB_V_DOUBLE_ARROW,   11,      sp_sel_trans_skew,    sp_sel_trans_skew_request,    0,   0.5}
 };
 
 SPSelTransHandle const handle_center =
-  {GTK_ANCHOR_CENTER, GDK_CROSSHAIR,      12,      sp_sel_trans_center,  sp_sel_trans_center_request,  0.5, 0.5};
+  {SP_ANCHOR_CENTER, GDK_CROSSHAIR,      12,      sp_sel_trans_center,  sp_sel_trans_center_request,  0.5, 0.5};
 
 
 /*
diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index 53dbd3cda..f58524c1a 100644
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -15,6 +15,7 @@
 #include "display/sodipodi-ctrl.h"
 #include <2geom/forward.h>
 #include <gdk/gdk.h>
+#include "enums.h"
 
 namespace Inkscape
 {
@@ -43,7 +44,7 @@ void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &h
 void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
 
 struct SPSelTransHandle {
-	GtkAnchorType anchor;
+	SPAnchorType anchor;
 	GdkCursorType cursor;
 	guint control;
 	void (* action) (Inkscape::SelTrans *seltrans, SPSelTransHandle const &handle, Geom::Point &p, guint state);
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 4ddac3c20..246dd82e0 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -129,7 +129,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) :
 
     _norm = sp_canvas_item_new(sp_desktop_controls(desktop),
                                SP_TYPE_CTRL,
-                               "anchor", GTK_ANCHOR_CENTER,
+                               "anchor", SP_ANCHOR_CENTER,
                                "mode", SP_CTRL_MODE_COLOR,
                                "shape", SP_CTRL_SHAPE_BITMAP,
                                "size", 13.0,
@@ -142,7 +142,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) :
 
     _grip = sp_canvas_item_new(sp_desktop_controls(desktop),
                                SP_TYPE_CTRL,
-                               "anchor", GTK_ANCHOR_CENTER,
+                               "anchor", SP_ANCHOR_CENTER,
                                "mode", SP_CTRL_MODE_XOR,
                                "shape", SP_CTRL_SHAPE_CROSS,
                                "size", 7.0,
@@ -754,7 +754,7 @@ static void sp_sel_trans_handle_click(SPKnot *knot, guint state, gpointer data)
 void Inkscape::SelTrans::handleClick(SPKnot */*knot*/, guint state, SPSelTransHandle const &handle)
 {
     switch (handle.anchor) {
-        case GTK_ANCHOR_CENTER:
+        case SP_ANCHOR_CENTER:
             if (state & GDK_SHIFT_MASK) {
                 // Unset the  center position for all selected items
                 for (GSList const *l = _desktop->selection->itemList(); l; l = l->next) {
@@ -776,7 +776,7 @@ void Inkscape::SelTrans::handleClick(SPKnot */*knot*/, guint state, SPSelTransHa
 void Inkscape::SelTrans::handleGrab(SPKnot *knot, guint /*state*/, SPSelTransHandle const &handle)
 {
     switch (handle.anchor) {
-        case GTK_ANCHOR_CENTER:
+        case SP_ANCHOR_CENTER:
             g_object_set(G_OBJECT(_grip),
                          "shape", SP_CTRL_SHAPE_BITMAP,
                          "size", 13.0,
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index a1768363c..092887541 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -666,14 +666,14 @@ SwatchesPanel::~SwatchesPanel()
     }
 }
 
-void SwatchesPanel::setOrientation( Gtk::AnchorType how )
+void SwatchesPanel::setOrientation(SPAnchorType how)
 {
     // Must call the parent class or bad things might happen
     Inkscape::UI::Widget::Panel::setOrientation( how );
 
     if ( _holder )
     {
-        _holder->setOrientation( Gtk::ANCHOR_SOUTH );
+        _holder->setOrientation(SP_ANCHOR_SOUTH);
     }
 }
 
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 0ff795ac3..ca4c1687d 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -11,6 +11,7 @@
 #define SEEN_DIALOGS_SWATCHES_H
 
 #include "ui/widget/panel.h"
+#include "enums.h"
 
 namespace Inkscape {
 namespace UI {
@@ -34,7 +35,7 @@ public:
 
     static SwatchesPanel& getInstance();
 
-    virtual void setOrientation( Gtk::AnchorType how );
+    virtual void setOrientation(SPAnchorType how);
 
     virtual void setDesktop( SPDesktop* desktop );
     virtual SPDesktop* getDesktop() {return _currentDesktop;}
diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h
index 07fbc4fc5..d5f609a0b 100644
--- a/src/ui/previewfillable.h
+++ b/src/ui/previewfillable.h
@@ -15,6 +15,7 @@
 
 #include "previewable.h"
 #include "../widgets/eek-preview.h"
+#include "enums.h"
 
 namespace Inkscape {
 namespace UI {
@@ -28,7 +29,7 @@ public:
     virtual void freezeUpdates() = 0;
     virtual void thawUpdates() = 0;
     virtual void setStyle( ::PreviewSize size, ViewType type, guint ratio) = 0;
-    virtual void setOrientation( Gtk::AnchorType how ) = 0;
+    virtual void setOrientation(SPAnchorType how) = 0;
     virtual ::PreviewSize getPreviewSize() const = 0;
     virtual ViewType getPreviewType() const = 0;
     virtual guint getPreviewRatio() const = 0;
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 9e69778b7..d8f1a21a9 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -34,7 +34,7 @@ PreviewHolder::PreviewHolder() :
     _insides(0),
     _prefCols(0),
     _updatesFrozen(false),
-    _anchor(Gtk::ANCHOR_CENTER),
+    _anchor(SP_ANCHOR_CENTER),
     _baseSize(PREVIEW_SIZE_SMALL),
     _ratio(100),
     _view(VIEW_TYPE_LIST),
@@ -63,7 +63,7 @@ void PreviewHolder::clear()
     items.clear();
     _prefCols = 0;
     // Kludge to restore scrollbars
-    if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == Gtk::ANCHOR_NORTH || _anchor == Gtk::ANCHOR_SOUTH) ) {
+    if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
         dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
     }
     rebuildUI();
@@ -136,29 +136,29 @@ void PreviewHolder::setStyle( ::PreviewSize size, ViewType view, guint ratio )
         _view = view;
         _ratio = ratio;
         // Kludge to restore scrollbars
-        if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == Gtk::ANCHOR_NORTH || _anchor == Gtk::ANCHOR_SOUTH) ) {
+        if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
             dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
         }
         rebuildUI();
     }
 }
 
-void PreviewHolder::setOrientation( Gtk::AnchorType how )
+void PreviewHolder::setOrientation(SPAnchorType how)
 {
     if ( _anchor != how )
     {
         _anchor = how;
         switch ( _anchor )
         {
-            case Gtk::ANCHOR_NORTH:
-            case Gtk::ANCHOR_SOUTH:
+            case SP_ANCHOR_NORTH:
+            case SP_ANCHOR_SOUTH:
             {
                 dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, _wrap ? Gtk::POLICY_AUTOMATIC : Gtk::POLICY_NEVER );
             }
             break;
 
-            case Gtk::ANCHOR_EAST:
-            case Gtk::ANCHOR_WEST:
+            case SP_ANCHOR_EAST:
+            case SP_ANCHOR_WEST:
             {
                 dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC );
             }
@@ -179,8 +179,8 @@ void PreviewHolder::setWrap( bool b )
         _wrap = b;
         switch ( _anchor )
         {
-            case Gtk::ANCHOR_NORTH:
-            case Gtk::ANCHOR_SOUTH:
+            case SP_ANCHOR_NORTH:
+            case SP_ANCHOR_SOUTH:
             {
                 dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, _wrap ? Gtk::POLICY_AUTOMATIC : Gtk::POLICY_NEVER );
             }
@@ -206,7 +206,7 @@ void PreviewHolder::on_size_allocate( Gtk::Allocation& allocation )
 //     g_message("            anchor:%d", _anchor);
     Gtk::VBox::on_size_allocate( allocation );
 
-    if ( _insides && !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == Gtk::ANCHOR_NORTH || _anchor == Gtk::ANCHOR_SOUTH) ) {
+    if ( _insides && !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
         Gtk::Requisition req = _insides->size_request();
         gint delta = allocation.get_width() - req.width;
 
@@ -232,7 +232,7 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int&
     width = itemCount;
     height = 1;
 
-    if ( _anchor == Gtk::ANCHOR_SOUTH || _anchor == Gtk::ANCHOR_NORTH ) {
+    if ( _anchor == SP_ANCHOR_SOUTH || _anchor == SP_ANCHOR_NORTH ) {
         Gtk::Requisition req = _scroller->size_request();
         int currW = _scroller->get_width();
         if ( currW > req.width ) {
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index c396cef19..5a0dfc267 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -18,6 +18,7 @@
 #include <gtkmm/table.h>
 #include "previewfillable.h"
 #include "../widgets/eek-preview.h"
+#include "enums.h"
 
 namespace Inkscape {
 namespace UI {
@@ -33,7 +34,7 @@ public:
     virtual void freezeUpdates();
     virtual void thawUpdates();
     virtual void setStyle( ::PreviewSize size, ViewType view, guint ratio );
-    virtual void setOrientation( Gtk::AnchorType how );
+    virtual void setOrientation(SPAnchorType how);
     virtual int getColumnPref() const { return _prefCols; }
     virtual void setColumnPref( int cols );
     virtual ::PreviewSize getPreviewSize() const { return _baseSize; }
@@ -56,7 +57,7 @@ private:
     Gtk::Table *_insides;
     int _prefCols;
     bool _updatesFrozen;
-    Gtk::AnchorType _anchor;
+    SPAnchorType _anchor;
     ::PreviewSize _baseSize;
     guint _ratio;
     ViewType _view;
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 8525e92f4..a5509655f 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -132,7 +132,7 @@ ControlPoint::ColorSet invisible_cset = {
  * @param group The canvas group the point's canvas item should be created in
  */
 ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, SPCtrlShapeType shape,
+        SPAnchorType anchor, SPCtrlShapeType shape,
         unsigned int size, ColorSet *cset, SPCanvasGroup *group)
     : _desktop (d)
     , _canvas_item (NULL)
@@ -142,7 +142,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
 {
     _canvas_item = sp_canvas_item_new(
         group ? group : sp_desktop_controls (_desktop), SP_TYPE_CTRL,
-        "anchor", (GtkAnchorType) anchor, "size", (gdouble) size, "shape", shape,
+        "anchor", (SPAnchorType) anchor, "size", (gdouble) size, "shape", shape,
         "filled", TRUE, "fill_color", _cset->normal.fill,
         "stroked", TRUE, "stroke_color", _cset->normal.stroke,
         "mode", SP_CTRL_MODE_XOR, NULL);
@@ -160,7 +160,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
  * @param group The canvas group the point's canvas item should be created in
  */
 ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
+        SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
         ColorSet *cset, SPCanvasGroup *group)
     : _desktop (d)
     , _canvas_item (NULL)
@@ -169,7 +169,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
 {
     _canvas_item = sp_canvas_item_new(
         group ? group : sp_desktop_controls(_desktop), SP_TYPE_CTRL,
-        "anchor", (GtkAnchorType) anchor, "size", (gdouble) pixbuf->get_width(),
+        "anchor", (SPAnchorType) anchor, "size", (gdouble) pixbuf->get_width(),
         "shape", SP_CTRL_SHAPE_BITMAP, "pixbuf", pixbuf->gobj(),
         "filled", TRUE, "fill_color", _cset->normal.fill,
         "stroked", TRUE, "stroke_color", _cset->normal.stroke,
@@ -262,9 +262,9 @@ SPCtrlShapeType ControlPoint::_shape() const
     return ret;
 }
 
-GtkAnchorType ControlPoint::_anchor() const
+SPAnchorType ControlPoint::_anchor() const
 {
-    GtkAnchorType ret;
+    SPAnchorType ret;
     g_object_get(_canvas_item, "anchor", &ret, NULL);
     return ret;
 }
@@ -288,7 +288,7 @@ void ControlPoint::_setShape(SPCtrlShapeType shape)
     g_object_set(_canvas_item, "shape", shape, NULL);
 }
 
-void ControlPoint::_setAnchor(GtkAnchorType anchor)
+void ControlPoint::_setAnchor(SPAnchorType anchor)
 {
     g_object_set(_canvas_item, "anchor", anchor, NULL);
 }
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index f37ff1451..8d1b778a7 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -19,8 +19,7 @@
 #include <2geom/point.h>
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
-
-#include <gtkmm/enums.h>
+#include "enums.h"
 
 class SPDesktop;
 class SPEventContext;
@@ -97,9 +96,9 @@ public:
     virtual bool _eventHandler(SPEventContext *event_context, GdkEvent *event);
 
 protected:
-    ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, Gtk::AnchorType anchor,
+    ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor,
         SPCtrlShapeType shape, unsigned int size, ColorSet *cset = 0, SPCanvasGroup *group = 0);
-    ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, Gtk::AnchorType anchor,
+    ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor,
         Glib::RefPtr<Gdk::Pixbuf> pixbuf, ColorSet *cset = 0, SPCanvasGroup *group = 0);
 
     /// @name Handle control point events in subclasses
@@ -142,12 +141,12 @@ protected:
 
     unsigned int _size() const;
     SPCtrlShapeType _shape() const;
-    GtkAnchorType _anchor() const;
+    SPAnchorType _anchor() const;
     Glib::RefPtr<Gdk::Pixbuf> _pixbuf();
 
     void _setSize(unsigned int size);
     void _setShape(SPCtrlShapeType shape);
-    void _setAnchor(GtkAnchorType anchor);
+    void _setAnchor(SPAnchorType anchor);
     void _setPixbuf(Glib::RefPtr<Gdk::Pixbuf>);
     /// @}
 
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index e932c022d..8754681df 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -38,7 +38,7 @@ bool CurveDragPoint::_segment_was_degenerate = false;
 
 CurveDragPoint::CurveDragPoint(PathManipulator &pm)
     : ControlPoint(pm._multi_path_manipulator._path_data.node_data.desktop, Geom::Point(),
-        Gtk::ANCHOR_CENTER, SP_CTRL_SHAPE_CIRCLE, 1.0, &invisible_cset,
+        SP_ANCHOR_CENTER, SP_CTRL_SHAPE_CIRCLE, 1.0, &invisible_cset,
         pm._multi_path_manipulator._path_data.dragpoint_group)
     , _pm(pm)
 {
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 8e39ec05a..ff644b4e3 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -81,7 +81,7 @@ double Handle::_saved_length = 0.0;
 bool Handle::_drag_out = false;
 
 Handle::Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node *parent)
-    : ControlPoint(data.desktop, initial_pos, Gtk::ANCHOR_CENTER, SP_CTRL_SHAPE_CIRCLE, 7.0,
+    : ControlPoint(data.desktop, initial_pos, SP_ANCHOR_CENTER, SP_CTRL_SHAPE_CIRCLE, 7.0,
         &handle_colors, data.handle_group)
     , _parent(parent)
     , _degenerate(true)
@@ -473,7 +473,7 @@ Glib::ustring Handle::_getDragTip(GdkEventMotion */*event*/)
  * The method move() keeps node type invariants during translations.
  */
 Node::Node(NodeSharedData const &data, Geom::Point const &initial_pos)
-    : SelectableControlPoint(data.desktop, initial_pos, Gtk::ANCHOR_CENTER,
+    : SelectableControlPoint(data.desktop, initial_pos, SP_ANCHOR_CENTER,
         SP_CTRL_SHAPE_DIAMOND, 9.0, *data.selection, &node_colors, data.node_group)
     , _front(data, initial_pos, this)
     , _back(data, initial_pos, this)
diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp
index c92dcaaae..cec2e7b07 100644
--- a/src/ui/tool/selectable-control-point.cpp
+++ b/src/ui/tool/selectable-control-point.cpp
@@ -27,7 +27,7 @@ static SelectableControlPoint::ColorSet default_scp_color_set = {
 };
 
 SelectableControlPoint::SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, SPCtrlShapeType shape, unsigned int size,
+        SPAnchorType anchor, SPCtrlShapeType shape, unsigned int size,
         ControlPointSelection &sel, ColorSet *cset, SPCanvasGroup *group)
     : ControlPoint (d, initial_pos, anchor, shape, size,
         cset ? reinterpret_cast<ControlPoint::ColorSet*>(cset)
@@ -37,7 +37,7 @@ SelectableControlPoint::SelectableControlPoint(SPDesktop *d, Geom::Point const &
     _selection.allPoints().insert(this);
 }
 SelectableControlPoint::SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
+        SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
         ControlPointSelection &sel, ColorSet *cset, SPCanvasGroup *group)
     : ControlPoint (d, initial_pos, anchor, pixbuf,
         cset ? reinterpret_cast<ControlPoint::ColorSet*>(cset)
diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index 9467aef74..8ecb39a79 100644
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -35,11 +35,11 @@ public:
     }
 protected:
     SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, SPCtrlShapeType shape,
+        SPAnchorType anchor, SPCtrlShapeType shape,
         unsigned int size, ControlPointSelection &sel, ColorSet *cset = 0,
         SPCanvasGroup *group = 0);
     SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos,
-        Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
+        SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pixbuf,
         ControlPointSelection &sel, ColorSet *cset = 0, SPCanvasGroup *group = 0);
 
     virtual void _setState(State state);
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 25d22ecdc..86ad05515 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -29,7 +29,7 @@ namespace UI {
 class SelectorPoint : public ControlPoint {
 public:
     SelectorPoint(SPDesktop *d, SPCanvasGroup *group, Selector *s)
-        : ControlPoint(d, Geom::Point(0,0), Gtk::ANCHOR_CENTER, SP_CTRL_SHAPE_SQUARE,
+        : ControlPoint(d, Geom::Point(0,0), SP_ANCHOR_CENTER, SP_CTRL_SHAPE_SQUARE,
             1, &invisible_cset, group)
         , _selector(s)
         , _cancel(false)
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 2cf6fe55a..b4a27170a 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -38,20 +38,20 @@ namespace Inkscape {
 namespace UI {
 
 namespace {
-Gtk::AnchorType corner_to_anchor(unsigned c) {
+SPAnchorType corner_to_anchor(unsigned c) {
     switch (c % 4) {
-    case 0: return Gtk::ANCHOR_NE;
-    case 1: return Gtk::ANCHOR_NW;
-    case 2: return Gtk::ANCHOR_SW;
-    default: return Gtk::ANCHOR_SE;
+    case 0: return SP_ANCHOR_NE;
+    case 1: return SP_ANCHOR_NW;
+    case 2: return SP_ANCHOR_SW;
+    default: return SP_ANCHOR_SE;
     }
 }
-Gtk::AnchorType side_to_anchor(unsigned s) {
+SPAnchorType side_to_anchor(unsigned s) {
     switch (s % 4) {
-    case 0: return Gtk::ANCHOR_N;
-    case 1: return Gtk::ANCHOR_W;
-    case 2: return Gtk::ANCHOR_S;
-    default: return Gtk::ANCHOR_E;
+    case 0: return SP_ANCHOR_N;
+    case 1: return SP_ANCHOR_W;
+    case 2: return SP_ANCHOR_S;
+    default: return SP_ANCHOR_E;
     }
 }
 
@@ -82,7 +82,7 @@ ControlPoint::ColorSet center_cset = {
 } // anonymous namespace
 
 /** Base class for node transform handles to simplify implementation */
-TransformHandle::TransformHandle(TransformHandleSet &th, Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb)
+TransformHandle::TransformHandle(TransformHandleSet &th, SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb)
     : ControlPoint(th._desktop, Geom::Point(), anchor, pb, &thandle_cset,
         th._transform_handle_group)
     , _th(th)
@@ -180,7 +180,7 @@ void TransformHandle::ungrabbed(GdkEventButton *)
 
 class ScaleHandle : public TransformHandle {
 public:
-    ScaleHandle(TransformHandleSet &th, Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb)
+    ScaleHandle(TransformHandleSet &th, SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb)
         : TransformHandle(th, anchor, pb)
     {}
 protected:
@@ -603,7 +603,7 @@ double SkewHandle::_last_angle = 0;
 class RotationCenter : public ControlPoint {
 public:
     RotationCenter(TransformHandleSet &th)
-        : ControlPoint(th._desktop, Geom::Point(), Gtk::ANCHOR_CENTER, _get_pixbuf(),
+        : ControlPoint(th._desktop, Geom::Point(), SP_ANCHOR_CENTER, _get_pixbuf(),
             &center_cset, th._transform_handle_group)
         , _th(th)
     {
diff --git a/src/ui/tool/transform-handle-set.h b/src/ui/tool/transform-handle-set.h
index f5f208e6f..cd1a61da2 100644
--- a/src/ui/tool/transform-handle-set.h
+++ b/src/ui/tool/transform-handle-set.h
@@ -16,6 +16,7 @@
 #include <2geom/forward.h>
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
+#include "enums.h"
 
 class SPDesktop;
 class CtrlRect;
@@ -81,7 +82,7 @@ private:
 /** Base class for node transform handles to simplify implementation */
 class TransformHandle : public ControlPoint {
 public:
-    TransformHandle(TransformHandleSet &th, Gtk::AnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb);
+    TransformHandle(TransformHandleSet &th, SPAnchorType anchor, Glib::RefPtr<Gdk::Pixbuf> pb);
     void getNextClosestPoint(bool reverse);
 
 protected:
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 0989c7d0d..45c4e5f07 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -88,7 +88,7 @@ void Panel::_popper(GdkEventButton* event)
 void Panel::_init()
 {
     Glib::ustring tmp("<");
-    _anchor = Gtk::ANCHOR_CENTER;
+    _anchor = SP_ANCHOR_CENTER;
 
     guint panel_size = 0, panel_mode = 0, panel_ratio = 100;
     bool panel_wrap = 0;
@@ -269,13 +269,13 @@ void Panel::setLabel(Glib::ustring const &label)
     _tab_title.set_label(_label);
 }
 
-void Panel::setOrientation(Gtk::AnchorType how)
+void Panel::setOrientation(SPAnchorType how)
 {
     if (_anchor != how) {
         _anchor = how;
         switch (_anchor) {
-            case Gtk::ANCHOR_NORTH:
-            case Gtk::ANCHOR_SOUTH:
+            case SP_ANCHOR_NORTH:
+            case SP_ANCHOR_SOUTH:
             {
                 if (_menu_desired) {
                     _menu_popper.reference();
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index c1942ef05..7b471c2ce 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -18,7 +18,7 @@
 #include <gtkmm/button.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/label.h>
-
+#include "enums.h"
 #include <vector>
 
 class SPDesktop;
@@ -80,7 +80,7 @@ public:
     int const &getVerb() const;
     Glib::ustring const &getApplyLabel() const;
 
-    virtual void setOrientation(Gtk::AnchorType how);
+    virtual void setOrientation(SPAnchorType how);
 
     virtual void present();  //< request to be present
 
@@ -126,7 +126,7 @@ protected:
      */
     Glib::ustring const _prefs_path;
     bool _menu_desired;
-    Gtk::AnchorType _anchor;
+    SPAnchorType _anchor;
 
     /* Signals */
     sigc::signal<void, int> _signal_response;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index b18847b58..c5c278e2d 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -348,7 +348,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
         using Inkscape::UI::Dialogs::SwatchesPanel;
 
         dtw->panels = new SwatchesPanel("/embedded/swatches");
-        dtw->panels->setOrientation( Gtk::ANCHOR_SOUTH );
+        dtw->panels->setOrientation(SP_ANCHOR_SOUTH);
         gtk_box_pack_end( GTK_BOX( dtw->vbox ), GTK_WIDGET(dtw->panels->gobj()), FALSE, TRUE, 0 );
     }