Adopt obsolete GtkAnchorType enum as SPAnchorType

(bzr r11207)

3 files changed, 27 insertions, 26 deletions

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;