[goocanvas] Add and use GooCanvasAnchorType, replacing removed GtkAnchorType.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goocanvas] Add and use GooCanvasAnchorType, replacing removed GtkAnchorType.
- Date: Mon, 6 Sep 2010 10:23:01 +0000 (UTC)
commit d481ce841dec4ea83ddef10dc10379aaa7107c78
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Sep 6 12:15:10 2010 +0200
Add and use GooCanvasAnchorType, replacing removed GtkAnchorType.
Note that the generated enum types are called GOO_TYPE_CANVAS_*,
but should really be GOO_CANVAS_TYPE_*.
demo/demo-arrowhead.c | 12 ++++----
demo/demo-clipping.c | 6 ++--
demo/demo-events.c | 2 +-
demo/demo-fifteen.c | 2 +-
demo/demo-table.c | 4 +-
demo/demo.c | 54 +++++++++++++++++++-------------------
demo/generic-position-demo.c | 2 +-
demo/mv-demo-arrowhead.c | 12 ++++----
demo/mv-demo-clipping.c | 6 ++--
demo/mv-demo-events.c | 2 +-
demo/mv-demo-fifteen.c | 2 +-
demo/mv-demo-table.c | 4 +-
demo/mv-demo.c | 54 +++++++++++++++++++-------------------
demo/mv-generic-position-demo.c | 2 +-
demo/mv-scalability-demo.c | 2 +-
demo/mv-simple-demo.c | 2 +-
demo/scalability-demo.c | 2 +-
demo/simple-demo.c | 2 +-
demo/units-demo.c | 6 ++--
demo/widgets-demo.c | 6 ++--
src/goocanvas.c | 44 ++++++++++++++++----------------
src/goocanvas.h | 2 +-
src/goocanvastext.c | 40 ++++++++++++++--------------
src/goocanvastext.h | 6 ++--
src/goocanvasutils.h | 23 ++++++++++++++++
src/goocanvaswidget.c | 36 +++++++++++++-------------
src/goocanvaswidget.h | 2 +-
27 files changed, 180 insertions(+), 157 deletions(-)
---
diff --git a/demo/demo-arrowhead.c b/demo/demo-arrowhead.c
index 4631eed..f33291c 100644
--- a/demo/demo-arrowhead.c
+++ b/demo/demo-arrowhead.c
@@ -192,7 +192,7 @@ create_dimension (GtkWidget *canvas,
GooCanvasItem *root,
char *arrow_name,
char *text_name,
- GtkAnchorType anchor)
+ GooCanvasAnchorType anchor)
{
GooCanvasItem *item;
@@ -219,7 +219,7 @@ create_info (GtkWidget *canvas,
{
GooCanvasItem *item;
- item = goo_canvas_text_new (root, NULL, x, y, -1, GTK_ANCHOR_NW,
+ item = goo_canvas_text_new (root, NULL, x, y, -1, GOO_CANVAS_ANCHOR_NW,
"fill_color", "black",
"font", "Sans 14",
NULL);
@@ -475,10 +475,10 @@ create_canvas_arrowhead (void)
/* Dimensions */
- create_dimension (canvas, root, "width_arrow", "width_text", GTK_ANCHOR_E);
- create_dimension (canvas, root, "shape_a_arrow", "shape_a_text", GTK_ANCHOR_N);
- create_dimension (canvas, root, "shape_b_arrow", "shape_b_text", GTK_ANCHOR_N);
- create_dimension (canvas, root, "shape_c_arrow", "shape_c_text", GTK_ANCHOR_W);
+ create_dimension (canvas, root, "width_arrow", "width_text", GOO_CANVAS_ANCHOR_E);
+ create_dimension (canvas, root, "shape_a_arrow", "shape_a_text", GOO_CANVAS_ANCHOR_N);
+ create_dimension (canvas, root, "shape_b_arrow", "shape_b_text", GOO_CANVAS_ANCHOR_N);
+ create_dimension (canvas, root, "shape_c_arrow", "shape_c_text", GOO_CANVAS_ANCHOR_W);
/* Info */
diff --git a/demo/demo-clipping.c b/demo/demo-clipping.c
index b69aa1c..805b31c 100644
--- a/demo/demo-clipping.c
+++ b/demo/demo-clipping.c
@@ -46,7 +46,7 @@ setup_canvas (GtkWidget *canvas)
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Yellow rectangle (unclipped)");
- item = goo_canvas_text_new (root, "Sample Text", 520, 100, -1, GTK_ANCHOR_NW,
+ item = goo_canvas_text_new (root, "Sample Text", 520, 100, -1, GOO_CANVAS_ANCHOR_NW,
NULL);
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Text (unclipped)");
@@ -78,7 +78,7 @@ setup_canvas (GtkWidget *canvas)
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Yellow rectangle");
- item = goo_canvas_text_new (root, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
+ item = goo_canvas_text_new (root, "Sample Text", 520, 300, -1, GOO_CANVAS_ANCHOR_NW,
"clip-path", "M535,300 h75 v40 h-75 z",
NULL);
g_signal_connect (item, "button_press_event",
@@ -121,7 +121,7 @@ setup_canvas (GtkWidget *canvas)
G_CALLBACK (on_button_press), "Yellow rectangle");
item = goo_canvas_text_new (table, "Sample Text", 520, 300, -1,
- GTK_ANCHOR_NW,
+ GOO_CANVAS_ANCHOR_NW,
"clip-path", "M535,300 h75 v40 h-75 z",
NULL);
goo_canvas_item_set_child_properties (table, item,
diff --git a/demo/demo-events.c b/demo/demo-events.c
index 73aab6f..40493f3 100644
--- a/demo/demo-events.c
+++ b/demo/demo-events.c
@@ -115,7 +115,7 @@ create_events_area (GtkWidget *canvas,
g_object_set_data_full (G_OBJECT (rect), "id", view_id, g_free);
setup_item_signals (rect);
- goo_canvas_text_new (root, label, x + 100, y + 130, -1, GTK_ANCHOR_CENTER,
+ goo_canvas_text_new (root, label, x + 100, y + 130, -1, GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans 12",
"fill-color", "blue",
NULL);
diff --git a/demo/demo-fifteen.c b/demo/demo-fifteen.c
index bd9f7a2..44b3768 100644
--- a/demo/demo-fifteen.c
+++ b/demo/demo-fifteen.c
@@ -300,7 +300,7 @@ create_canvas_fifteen (void)
text = goo_canvas_text_new (board[i], buf,
PIECE_SIZE / 2.0, PIECE_SIZE / 2.0,
- -1, GTK_ANCHOR_CENTER,
+ -1, GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans bold 24",
"fill_color", "black",
NULL);
diff --git a/demo/demo-table.c b/demo/demo-table.c
index b1f5856..35ede48 100644
--- a/demo/demo-table.c
+++ b/demo/demo-table.c
@@ -46,7 +46,7 @@ create_demo_item (GooCanvasItem *table,
NULL);
break;
case DEMO_TEXT_ITEM:
- item = goo_canvas_text_new (table, text, 0, 0, -1, GTK_ANCHOR_NW, NULL);
+ item = goo_canvas_text_new (table, text, 0, 0, -1, GOO_CANVAS_ANCHOR_NW, NULL);
break;
case DEMO_WIDGET_ITEM:
widget = gtk_button_new_with_label (text);
@@ -241,7 +241,7 @@ create_width_for_height_table (GooCanvasItem *root,
NULL);
#if 1
- item = goo_canvas_text_new (table, text, 0, 0, -1, GTK_ANCHOR_NW, NULL);
+ item = goo_canvas_text_new (table, text, 0, 0, -1, GOO_CANVAS_ANCHOR_NW, NULL);
goo_canvas_item_set_child_properties (table, item,
"row", 1,
"column", 0,
diff --git a/demo/demo.c b/demo/demo.c
index 227f8bf..ef46d42 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -106,7 +106,7 @@ center_toggled (GtkToggleButton *button, gpointer data)
static void
anchor_toggled (GtkWidget *button, GooCanvas *canvas)
{
- GtkAnchorType anchor;
+ GooCanvasAnchorType anchor;
anchor = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "anchor"));
@@ -646,7 +646,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_NW));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_NW));
w = gtk_radio_button_new_with_label (group, "N");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -656,7 +656,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_N));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_N));
w = gtk_radio_button_new_with_label (group, "NE");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -666,7 +666,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_NE));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_NE));
w = gtk_radio_button_new_with_label (group, "W");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -676,7 +676,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_W));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_W));
w = gtk_radio_button_new_with_label (group, "C");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -686,7 +686,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_CENTER));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_CENTER));
w = gtk_radio_button_new_with_label (group, "E");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -696,7 +696,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_E));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_E));
w = gtk_radio_button_new_with_label (group, "SW");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -706,7 +706,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_SW));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_SW));
w = gtk_radio_button_new_with_label (group, "S");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -716,7 +716,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_S));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_S));
w = gtk_radio_button_new_with_label (group, "SE");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -726,7 +726,7 @@ create_canvas_primitives ()
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_SE));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_SE));
/* Layout the stuff */
@@ -762,7 +762,7 @@ setup_heading (GooCanvasItem *root, char *text, int pos)
GooCanvasItem *item;
PangoRectangle ink_rect, logical_rect;
- item = goo_canvas_text_new (root, text, x, y, -1, GTK_ANCHOR_N,
+ item = goo_canvas_text_new (root, text, x, y, -1, GOO_CANVAS_ANCHOR_N,
"font", "Sans 12",
NULL);
goo_canvas_item_skew_y (item, 30, x, y);
@@ -1202,7 +1202,7 @@ setup_texts (GooCanvasItem *root)
#if 1
pattern = create_stipple ("blue", stipple_data);
item = goo_canvas_text_new (make_anchor (root, 420, 20),
- "Anchor NW", 0, 0, -1, GTK_ANCHOR_NW,
+ "Anchor NW", 0, 0, -1, GOO_CANVAS_ANCHOR_NW,
"font", "Sans Bold 24",
"fill_pattern", pattern,
NULL);
@@ -1211,7 +1211,7 @@ setup_texts (GooCanvasItem *root)
item = goo_canvas_text_new (make_anchor (root, 470, 75),
"Anchor center\nJustify center\nMultiline text\nb8bit text ���åäö",
- 0, 0, -1, GTK_ANCHOR_CENTER,
+ 0, 0, -1, GOO_CANVAS_ANCHOR_CENTER,
"font", "monospace bold 14",
"alignment", PANGO_ALIGN_CENTER,
"fill_color", "firebrick",
@@ -1222,7 +1222,7 @@ setup_texts (GooCanvasItem *root)
#if 0
item = goo_canvas_text_new (make_anchor (root, 590, 140),
"Clipped text\nClipped text\nClipped text\nClipped text\nClipped text\nClipped text",
- 0, 0, -1, GTK_ANCHOR_SE,
+ 0, 0, -1, GOO_CANVAS_ANCHOR_SE,
"font", "Sans 12",
/*"clip", TRUE,*/
/*"clip_width", 50.0,*/
@@ -1236,7 +1236,7 @@ setup_texts (GooCanvasItem *root)
#if 1
textitem = goo_canvas_text_new (make_anchor (root, 420, 240),
"This is a very long paragraph that will need to be wrapped over several lines so we can see what happens to line-breaking as the view is zoomed in and out.",
- 0, 0, 180, GTK_ANCHOR_W,
+ 0, 0, 180, GOO_CANVAS_ANCHOR_W,
"font", "Sans 12",
"fill_color", "goldenrod",
NULL);
@@ -1246,7 +1246,7 @@ setup_texts (GooCanvasItem *root)
#if 1
textitem = goo_canvas_text_new (root,
"Ellipsized text.",
- 20, 420, 115, GTK_ANCHOR_W,
+ 20, 420, 115, GOO_CANVAS_ANCHOR_W,
"font", "Sans 12",
"fill_color", "blue",
"ellipsize", PANGO_ELLIPSIZE_END,
@@ -1260,7 +1260,7 @@ static void
setup_invisible_texts (GooCanvasItem *root)
{
goo_canvas_text_new (root, "Visible above 0.8x", 500, 330, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 0.8,
NULL);
@@ -1271,7 +1271,7 @@ setup_invisible_texts (GooCanvasItem *root)
NULL);
goo_canvas_text_new (root, "Visible above 1.5x", 500, 350, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 1.5,
NULL);
@@ -1282,7 +1282,7 @@ setup_invisible_texts (GooCanvasItem *root)
NULL);
goo_canvas_text_new (root, "Visible above 3.0x", 500, 370, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 3.0,
NULL);
@@ -1294,7 +1294,7 @@ setup_invisible_texts (GooCanvasItem *root)
/* This should never be seen. */
goo_canvas_text_new (root, "Always Invisible", 500, 390, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_INVISIBLE,
NULL);
goo_canvas_rect_new (root, 410.5, 350.5, 180, 15,
@@ -1305,7 +1305,7 @@ setup_invisible_texts (GooCanvasItem *root)
static void
-plant_flower (GooCanvasItem *root, double x, double y, GtkAnchorType anchor)
+plant_flower (GooCanvasItem *root, double x, double y, GooCanvasAnchorType anchor)
{
cairo_pattern_t *pattern;
cairo_surface_t *surface;
@@ -1344,7 +1344,7 @@ setup_images (GooCanvasItem *root)
image = goo_canvas_image_new (root, im, 100.0 - w / 2, 225.0 - h / 2,
"width", w,
"height", h,
- /* "anchor", GTK_ANCHOR_CENTER, */
+ /* "anchor", GOO_CANVAS_ANCHOR_CENTER, */
NULL);
g_object_unref(im);
setup_item_signals (image);
@@ -1352,10 +1352,10 @@ setup_images (GooCanvasItem *root)
else
g_warning ("Could not find the toroid.png sample file");
- plant_flower (root, 20.0, 170.0, GTK_ANCHOR_NW);
- plant_flower (root, 180.0, 170.0, GTK_ANCHOR_NE);
- plant_flower (root, 20.0, 280.0, GTK_ANCHOR_SW);
- plant_flower (root, 180.0, 280.0, GTK_ANCHOR_SE);
+ plant_flower (root, 20.0, 170.0, GOO_CANVAS_ANCHOR_NW);
+ plant_flower (root, 180.0, 170.0, GOO_CANVAS_ANCHOR_NE);
+ plant_flower (root, 20.0, 280.0, GOO_CANVAS_ANCHOR_SW);
+ plant_flower (root, 180.0, 280.0, GOO_CANVAS_ANCHOR_SE);
}
@@ -1390,7 +1390,7 @@ setup_static_items (GooCanvas *canvas)
NULL);
setup_item_signals (item);
- item = goo_canvas_text_new (group, "N", 40, 320, -1, GTK_ANCHOR_S,
+ item = goo_canvas_text_new (group, "N", 40, 320, -1, GOO_CANVAS_ANCHOR_S,
"font", "Sans 12",
NULL);
setup_item_signals (item);
diff --git a/demo/generic-position-demo.c b/demo/generic-position-demo.c
index 7691a72..ac101d7 100644
--- a/demo/generic-position-demo.c
+++ b/demo/generic-position-demo.c
@@ -140,7 +140,7 @@ setup_canvas (GtkWidget *canvas)
g_object_unref (pixbuf);
setup_dnd_handlers (GOO_CANVAS (canvas), item);
- item = goo_canvas_text_new (root, "Hello, World!", 250, 450, -1, GTK_ANCHOR_NW, "fill-color", "magenta", "wrap", PANGO_WRAP_WORD_CHAR, NULL);
+ item = goo_canvas_text_new (root, "Hello, World!", 250, 450, -1, GOO_CANVAS_ANCHOR_NW, "fill-color", "magenta", "wrap", PANGO_WRAP_WORD_CHAR, NULL);
setup_dnd_handlers (GOO_CANVAS (canvas), item);
button = gtk_label_new ("GtkLabel");
diff --git a/demo/mv-demo-arrowhead.c b/demo/mv-demo-arrowhead.c
index 59eaea8..09d6301 100644
--- a/demo/mv-demo-arrowhead.c
+++ b/demo/mv-demo-arrowhead.c
@@ -207,7 +207,7 @@ create_dimension (GtkWidget *canvas,
GooCanvasItemModel *root,
char *arrow_name,
char *text_name,
- GtkAnchorType anchor)
+ GooCanvasAnchorType anchor)
{
GooCanvasItemModel *item;
@@ -234,7 +234,7 @@ create_info (GtkWidget *canvas,
{
GooCanvasItemModel *item;
- item = goo_canvas_text_model_new (root, NULL, x, y, -1, GTK_ANCHOR_NW,
+ item = goo_canvas_text_model_new (root, NULL, x, y, -1, GOO_CANVAS_ANCHOR_NW,
"fill_color", "black",
"font", "Sans 14",
NULL);
@@ -496,10 +496,10 @@ create_canvas_arrowhead (void)
/* Dimensions */
- create_dimension (canvas, root, "width_arrow", "width_text", GTK_ANCHOR_E);
- create_dimension (canvas, root, "shape_a_arrow", "shape_a_text", GTK_ANCHOR_N);
- create_dimension (canvas, root, "shape_b_arrow", "shape_b_text", GTK_ANCHOR_N);
- create_dimension (canvas, root, "shape_c_arrow", "shape_c_text", GTK_ANCHOR_W);
+ create_dimension (canvas, root, "width_arrow", "width_text", GOO_CANVAS_ANCHOR_E);
+ create_dimension (canvas, root, "shape_a_arrow", "shape_a_text", GOO_CANVAS_ANCHOR_N);
+ create_dimension (canvas, root, "shape_b_arrow", "shape_b_text", GOO_CANVAS_ANCHOR_N);
+ create_dimension (canvas, root, "shape_c_arrow", "shape_c_text", GOO_CANVAS_ANCHOR_W);
/* Info */
diff --git a/demo/mv-demo-clipping.c b/demo/mv-demo-clipping.c
index f9810bf..1c46dc7 100644
--- a/demo/mv-demo-clipping.c
+++ b/demo/mv-demo-clipping.c
@@ -52,7 +52,7 @@ setup_canvas (GooCanvas *canvas)
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Yellow rectangle (unclipped)");
- model = goo_canvas_text_model_new (root, "Sample Text", 520, 100, -1, GTK_ANCHOR_NW,
+ model = goo_canvas_text_model_new (root, "Sample Text", 520, 100, -1, GOO_CANVAS_ANCHOR_NW,
NULL);
item = goo_canvas_get_item (canvas, model);
g_signal_connect (item, "button_press_event",
@@ -87,7 +87,7 @@ setup_canvas (GooCanvas *canvas)
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Yellow rectangle");
- model = goo_canvas_text_model_new (root, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
+ model = goo_canvas_text_model_new (root, "Sample Text", 520, 300, -1, GOO_CANVAS_ANCHOR_NW,
"clip-path", "M535,300 h75 v40 h-75 z",
NULL);
item = goo_canvas_get_item (canvas, model);
@@ -134,7 +134,7 @@ setup_canvas (GooCanvas *canvas)
g_signal_connect (item, "button_press_event",
G_CALLBACK (on_button_press), "Yellow rectangle");
- model = goo_canvas_text_model_new (table, "Sample Text", 520, 300, -1, GTK_ANCHOR_NW,
+ model = goo_canvas_text_model_new (table, "Sample Text", 520, 300, -1, GOO_CANVAS_ANCHOR_NW,
"clip-path", "M535,300 h75 v40 h-75 z",
NULL);
goo_canvas_item_model_set_child_properties (table, model,
diff --git a/demo/mv-demo-events.c b/demo/mv-demo-events.c
index b72686f..13f4387 100644
--- a/demo/mv-demo-events.c
+++ b/demo/mv-demo-events.c
@@ -116,7 +116,7 @@ create_events_area (GooCanvasItemModel *root,
g_object_set_data_full (G_OBJECT (rect), "id", view_id, g_free);
goo_canvas_text_model_new (root, label, x + 100, y + 130, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans 12",
"fill-color", "blue",
NULL);
diff --git a/demo/mv-demo-fifteen.c b/demo/mv-demo-fifteen.c
index b93f09f..08ff3ab 100644
--- a/demo/mv-demo-fifteen.c
+++ b/demo/mv-demo-fifteen.c
@@ -309,7 +309,7 @@ create_canvas_fifteen (void)
text = goo_canvas_text_model_new (board[i], buf,
PIECE_SIZE / 2.0, PIECE_SIZE / 2.0,
- -1, GTK_ANCHOR_CENTER,
+ -1, GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans bold 24",
"fill_color", "black",
NULL);
diff --git a/demo/mv-demo-table.c b/demo/mv-demo-table.c
index baec1d8..9ad4d08 100644
--- a/demo/mv-demo-table.c
+++ b/demo/mv-demo-table.c
@@ -46,7 +46,7 @@ create_demo_item (GooCanvasItemModel *table,
NULL);
break;
case DEMO_TEXT_ITEM:
- model = goo_canvas_text_model_new (table, text, 0, 0, -1, GTK_ANCHOR_NW,
+ model = goo_canvas_text_model_new (table, text, 0, 0, -1, GOO_CANVAS_ANCHOR_NW,
NULL);
break;
}
@@ -244,7 +244,7 @@ create_width_for_height_table (GooCanvasItemModel *root,
NULL);
#if 1
- model = goo_canvas_text_model_new (table, text, 0, 0, -1, GTK_ANCHOR_NW, NULL);
+ model = goo_canvas_text_model_new (table, text, 0, 0, -1, GOO_CANVAS_ANCHOR_NW, NULL);
goo_canvas_item_model_set_child_properties (table, model,
"row", 1,
"column", 0,
diff --git a/demo/mv-demo.c b/demo/mv-demo.c
index d4d2e5e..49be065 100644
--- a/demo/mv-demo.c
+++ b/demo/mv-demo.c
@@ -75,7 +75,7 @@ center_toggled (GtkToggleButton *button, gpointer data)
static void
anchor_toggled (GtkWidget *button, GooCanvas *canvas)
{
- GtkAnchorType anchor;
+ GooCanvasAnchorType anchor;
anchor = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "anchor"));
@@ -540,7 +540,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_NW));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_NW));
w = gtk_radio_button_new_with_label (group, "N");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -550,7 +550,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_N));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_N));
w = gtk_radio_button_new_with_label (group, "NE");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -560,7 +560,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_NE));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_NE));
w = gtk_radio_button_new_with_label (group, "W");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -570,7 +570,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_W));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_W));
w = gtk_radio_button_new_with_label (group, "C");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -580,7 +580,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_CENTER));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_CENTER));
w = gtk_radio_button_new_with_label (group, "E");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -590,7 +590,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_E));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_E));
w = gtk_radio_button_new_with_label (group, "SW");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -600,7 +600,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_SW));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_SW));
w = gtk_radio_button_new_with_label (group, "S");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -610,7 +610,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_S));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_S));
w = gtk_radio_button_new_with_label (group, "SE");
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (w));
@@ -620,7 +620,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
G_CALLBACK (anchor_toggled),
canvas);
g_object_set_data (G_OBJECT (w), "anchor",
- GINT_TO_POINTER (GTK_ANCHOR_SE));
+ GINT_TO_POINTER (GOO_CANVAS_ANCHOR_SE));
/* Layout the stuff */
@@ -658,7 +658,7 @@ setup_heading (GooCanvasItemModel *root, char *text, int pos)
double y = (pos / 3) * 150 + 5;
GooCanvasItemModel *item;
- item = goo_canvas_text_model_new (root, text, x, y, -1, GTK_ANCHOR_N,
+ item = goo_canvas_text_model_new (root, text, x, y, -1, GOO_CANVAS_ANCHOR_N,
"font", "Sans 12",
NULL);
goo_canvas_item_model_skew_y (item, 30, x, y);
@@ -1073,7 +1073,7 @@ setup_texts (GooCanvasItemModel *root)
#if 1
pattern = create_stipple ("blue", stipple_data);
goo_canvas_text_model_new (make_anchor (root, 420, 20),
- "Anchor NW", 0, 0, -1, GTK_ANCHOR_NW,
+ "Anchor NW", 0, 0, -1, GOO_CANVAS_ANCHOR_NW,
"font", "Sans Bold 24",
"fill_pattern", pattern,
NULL);
@@ -1081,7 +1081,7 @@ setup_texts (GooCanvasItemModel *root)
goo_canvas_text_model_new (make_anchor (root, 470, 75),
"Anchor center\nJustify center\nMultiline text\nb8bit text ���åäö",
- 0, 0, -1, GTK_ANCHOR_CENTER,
+ 0, 0, -1, GOO_CANVAS_ANCHOR_CENTER,
"font", "monospace bold 14",
"alignment", PANGO_ALIGN_CENTER,
"fill_color", "firebrick",
@@ -1091,7 +1091,7 @@ setup_texts (GooCanvasItemModel *root)
#if 0
goo_canvas_text_model_new (make_anchor (root, 590, 140),
"Clipped text\nClipped text\nClipped text\nClipped text\nClipped text\nClipped text",
- 0, 0, -1, GTK_ANCHOR_SE,
+ 0, 0, -1, GOO_CANVAS_ANCHOR_SE,
"font", "Sans 12",
/*"clip", TRUE,*/
/*"clip_width", 50.0,*/
@@ -1104,7 +1104,7 @@ setup_texts (GooCanvasItemModel *root)
#if 1
textitem = goo_canvas_text_model_new (make_anchor (root, 420, 240),
"This is a very long paragraph that will need to be wrapped over several lines so we can see what happens to line-breaking as the view is zoomed in and out.",
- 0, 0, 180, GTK_ANCHOR_W,
+ 0, 0, 180, GOO_CANVAS_ANCHOR_W,
"font", "Sans 12",
"fill_color", "goldenrod",
NULL);
@@ -1113,7 +1113,7 @@ setup_texts (GooCanvasItemModel *root)
#if 1
textitem = goo_canvas_text_model_new (root,
"Ellipsized text.",
- 20, 420, 115, GTK_ANCHOR_W,
+ 20, 420, 115, GOO_CANVAS_ANCHOR_W,
"font", "Sans 12",
"fill_color", "blue",
"ellipsize", PANGO_ELLIPSIZE_END,
@@ -1126,7 +1126,7 @@ static void
setup_invisible_texts (GooCanvasItemModel *root)
{
goo_canvas_text_model_new (root, "Visible above 0.8x", 500, 330, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 0.8,
NULL);
@@ -1137,7 +1137,7 @@ setup_invisible_texts (GooCanvasItemModel *root)
NULL);
goo_canvas_text_model_new (root, "Visible above 1.5x", 500, 350, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 1.5,
NULL);
@@ -1148,7 +1148,7 @@ setup_invisible_texts (GooCanvasItemModel *root)
NULL);
goo_canvas_text_model_new (root, "Visible above 3.0x", 500, 370, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_VISIBLE_ABOVE_THRESHOLD,
"visibility-threshold", 3.0,
NULL);
@@ -1160,7 +1160,7 @@ setup_invisible_texts (GooCanvasItemModel *root)
/* This should never be seen. */
goo_canvas_text_model_new (root, "Always Invisible", 500, 390, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"visibility", GOO_CANVAS_ITEM_INVISIBLE,
NULL);
goo_canvas_rect_model_new (root, 410.5, 350.5, 180, 15,
@@ -1173,7 +1173,7 @@ setup_invisible_texts (GooCanvasItemModel *root)
static void
plant_flower (GooCanvasItemModel *root,
double x, double y,
- GtkAnchorType anchor)
+ GooCanvasAnchorType anchor)
{
cairo_pattern_t *pattern;
cairo_surface_t *surface;
@@ -1211,17 +1211,17 @@ setup_images (GooCanvasItemModel *root)
image = goo_canvas_image_model_new (root, im, 100.0 - w / 2, 225.0 - h / 2,
"width", w,
"height", h,
- /* "anchor", GTK_ANCHOR_CENTER, */
+ /* "anchor", GOO_CANVAS_ANCHOR_CENTER, */
NULL);
g_object_unref(im);
}
else
g_warning ("Could not find the toroid.png sample file");
- plant_flower (root, 20.0, 170.0, GTK_ANCHOR_NW);
- plant_flower (root, 180.0, 170.0, GTK_ANCHOR_NE);
- plant_flower (root, 20.0, 280.0, GTK_ANCHOR_SW);
- plant_flower (root, 180.0, 280.0, GTK_ANCHOR_SE);
+ plant_flower (root, 20.0, 170.0, GOO_CANVAS_ANCHOR_NW);
+ plant_flower (root, 180.0, 170.0, GOO_CANVAS_ANCHOR_NE);
+ plant_flower (root, 20.0, 280.0, GOO_CANVAS_ANCHOR_SW);
+ plant_flower (root, 180.0, 280.0, GOO_CANVAS_ANCHOR_SE);
}
@@ -1252,7 +1252,7 @@ create_static_model ()
"line-width", 3.0,
NULL);
- item = goo_canvas_text_model_new (group, "N", 40, 320, -1, GTK_ANCHOR_S,
+ item = goo_canvas_text_model_new (group, "N", 40, 320, -1, GOO_CANVAS_ANCHOR_S,
"font", "Sans 12",
NULL);
diff --git a/demo/mv-generic-position-demo.c b/demo/mv-generic-position-demo.c
index f6a0c59..be27bf6 100644
--- a/demo/mv-generic-position-demo.c
+++ b/demo/mv-generic-position-demo.c
@@ -147,7 +147,7 @@ create_model (GdkPixbuf *pixbuf)
g_object_unref (pixbuf);
g_object_set_data (G_OBJECT (item), "setup-dnd-signals", "TRUE");
- item = goo_canvas_text_model_new (root, "Hello, World!", 250, 450, -1, GTK_ANCHOR_NW, "fill-color", "magenta", "wrap", PANGO_WRAP_WORD_CHAR, NULL);
+ item = goo_canvas_text_model_new (root, "Hello, World!", 250, 450, -1, GOO_CANVAS_ANCHOR_NW, "fill-color", "magenta", "wrap", PANGO_WRAP_WORD_CHAR, NULL);
g_object_set_data (G_OBJECT (item), "setup-dnd-signals", "TRUE");
item = goo_canvas_table_model_new (root, "horz-grid-line-width", 2.0, "vert-grid-line-width", 2.0, "row-spacing", 2.0, "column-spacing", 2.0, NULL);
diff --git a/demo/mv-scalability-demo.c b/demo/mv-scalability-demo.c
index e07f2d2..23c0134 100644
--- a/demo/mv-scalability-demo.c
+++ b/demo/mv-scalability-demo.c
@@ -216,7 +216,7 @@ setup_canvas (GtkWidget *canvas)
model = goo_canvas_text_model_new (group, ids[id_item_num],
item_x + item_width / 2,
item_y + item_height / 2,
- item_width, GTK_ANCHOR_CENTER,
+ item_width, GOO_CANVAS_ANCHOR_CENTER,
"height", item_height,
/*"alignment", PANGO_ALIGN_CENTER,*/
NULL);
diff --git a/demo/mv-simple-demo.c b/demo/mv-simple-demo.c
index 91ad672..b9f4be8 100644
--- a/demo/mv-simple-demo.c
+++ b/demo/mv-simple-demo.c
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
NULL);
text_model = goo_canvas_text_model_new (root, "Hello World", 300, 300, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans 24",
NULL);
goo_canvas_item_model_rotate (text_model, 45, 300, 300);
diff --git a/demo/scalability-demo.c b/demo/scalability-demo.c
index 6d9dd55..408b7b9 100644
--- a/demo/scalability-demo.c
+++ b/demo/scalability-demo.c
@@ -212,7 +212,7 @@ setup_canvas (GtkWidget *canvas)
item = goo_canvas_text_new (group, ids[id_item_num],
item_x + item_width / 2,
item_y + item_height / 2,
- item_width, GTK_ANCHOR_CENTER,
+ item_width, GOO_CANVAS_ANCHOR_CENTER,
"height", item_height,
/*"alignment", PANGO_ALIGN_CENTER,*/
NULL);
diff --git a/demo/simple-demo.c b/demo/simple-demo.c
index 4f58430..d9372bb 100644
--- a/demo/simple-demo.c
+++ b/demo/simple-demo.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
NULL);
text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"font", "Sans 24",
NULL);
goo_canvas_item_rotate (text_item, 45, 300, 300);
diff --git a/demo/units-demo.c b/demo/units-demo.c
index e6e28bb..c854cab 100644
--- a/demo/units-demo.c
+++ b/demo/units-demo.c
@@ -65,7 +65,7 @@ setup_canvas (GtkWidget *canvas,
sprintf (buffer, "This box is %gx%g %s", d[2], d[3], units_name);
sprintf (font_desc, "Sans %gpx", d[4]);
item = goo_canvas_text_new (root, buffer, d[0] + d[2] / 2, d[1] + d[3] / 2,
- -1, GTK_ANCHOR_CENTER,
+ -1, GOO_CANVAS_ANCHOR_CENTER,
"font", font_desc,
NULL);
@@ -73,7 +73,7 @@ setup_canvas (GtkWidget *canvas,
sprintf (buffer, "This font is %g %s high", d[7], units_name);
sprintf (font_desc, "Sans %gpx", d[7]);
item = goo_canvas_text_new (root, buffer, d[5], d[6], -1,
- GTK_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_CENTER,
"font", font_desc,
NULL);
@@ -134,7 +134,7 @@ create_canvas (GtkUnit units,
goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 1000, 1000);
g_object_set (canvas,
"units", units,
- "anchor", GTK_ANCHOR_CENTER,
+ "anchor", GOO_CANVAS_ANCHOR_CENTER,
NULL);
gtk_widget_show (canvas);
diff --git a/demo/widgets-demo.c b/demo/widgets-demo.c
index 9696dcb..9325a03 100644
--- a/demo/widgets-demo.c
+++ b/demo/widgets-demo.c
@@ -72,15 +72,15 @@ move_widget_clicked (GtkWidget *button, gpointer data)
static void
change_anchor_clicked (GtkWidget *button, gpointer data)
{
- static GtkAnchorType anchor = GTK_ANCHOR_CENTER;
+ static GooCanvasAnchorType anchor = GOO_CANVAS_ANCHOR_CENTER;
g_print ("Setting anchor to: %i\n", anchor);
g_object_set (move_item,
"anchor", anchor,
NULL);
anchor++;
- if (anchor > GTK_ANCHOR_EAST)
- anchor = GTK_ANCHOR_CENTER;
+ if (anchor > GOO_CANVAS_ANCHOR_EAST)
+ anchor = GOO_CANVAS_ANCHOR_CENTER;
}
diff --git a/src/goocanvas.c b/src/goocanvas.c
index d2e831f..abdb84c 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -63,7 +63,7 @@
* NULL);
*
* text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
- * GTK_ANCHOR_CENTER,
+ * GOO_CANVAS_ANCHOR_CENTER,
* "font", "Sans 24",
* NULL);
* goo_canvas_item_rotate (text_item, 45, 300, 300);
@@ -304,8 +304,8 @@ goo_canvas_class_init (GooCanvasClass *klass)
g_param_spec_enum ("anchor",
_("Anchor"),
_("Where to place the canvas when it is smaller than the widget's allocated area"),
- GTK_TYPE_ANCHOR_TYPE,
- GTK_ANCHOR_NW,
+ GOO_TYPE_CANVAS_ANCHOR_TYPE,
+ GOO_CANVAS_ANCHOR_NW,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_X1,
@@ -486,7 +486,7 @@ goo_canvas_init (GooCanvas *canvas)
canvas->need_update = TRUE;
canvas->need_entire_subtree_update = TRUE;
canvas->crossing_event.type = GDK_LEAVE_NOTIFY;
- canvas->anchor = GTK_ANCHOR_NORTH_WEST;
+ canvas->anchor = GOO_CANVAS_ANCHOR_NORTH_WEST;
canvas->clear_background = TRUE;
canvas->redraw_when_scrolled = FALSE;
canvas->before_initial_expose = TRUE;
@@ -1823,19 +1823,19 @@ reconfigure_canvas (GooCanvas *canvas,
{
switch (canvas->anchor)
{
- case GTK_ANCHOR_NORTH_WEST:
- case GTK_ANCHOR_WEST:
- case GTK_ANCHOR_SOUTH_WEST:
+ case GOO_CANVAS_ANCHOR_NORTH_WEST:
+ case GOO_CANVAS_ANCHOR_WEST:
+ case GOO_CANVAS_ANCHOR_SOUTH_WEST:
new_x_offset = 0;
break;
- case GTK_ANCHOR_NORTH:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_SOUTH:
+ case GOO_CANVAS_ANCHOR_NORTH:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_SOUTH:
new_x_offset = (allocation.width - width_pixels) / 2;
break;
- case GTK_ANCHOR_NORTH_EAST:
- case GTK_ANCHOR_EAST:
- case GTK_ANCHOR_SOUTH_EAST:
+ case GOO_CANVAS_ANCHOR_NORTH_EAST:
+ case GOO_CANVAS_ANCHOR_EAST:
+ case GOO_CANVAS_ANCHOR_SOUTH_EAST:
new_x_offset = allocation.width - width_pixels;
break;
}
@@ -1845,19 +1845,19 @@ reconfigure_canvas (GooCanvas *canvas,
{
switch (canvas->anchor)
{
- case GTK_ANCHOR_NORTH_WEST:
- case GTK_ANCHOR_NORTH:
- case GTK_ANCHOR_NORTH_EAST:
+ case GOO_CANVAS_ANCHOR_NORTH_WEST:
+ case GOO_CANVAS_ANCHOR_NORTH:
+ case GOO_CANVAS_ANCHOR_NORTH_EAST:
new_y_offset = 0;
break;
- case GTK_ANCHOR_WEST:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_EAST:
+ case GOO_CANVAS_ANCHOR_WEST:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_EAST:
new_y_offset = (allocation.height - height_pixels) / 2;
break;
- case GTK_ANCHOR_SOUTH_WEST:
- case GTK_ANCHOR_SOUTH:
- case GTK_ANCHOR_SOUTH_EAST:
+ case GOO_CANVAS_ANCHOR_SOUTH_WEST:
+ case GOO_CANVAS_ANCHOR_SOUTH:
+ case GOO_CANVAS_ANCHOR_SOUTH_EAST:
new_y_offset = allocation.height - height_pixels;
break;
}
diff --git a/src/goocanvas.h b/src/goocanvas.h
index 3b2bcd0..91cd277 100644
--- a/src/goocanvas.h
+++ b/src/goocanvas.h
@@ -60,7 +60,7 @@ struct _GooCanvas
/* Where the canvas is anchored (where it is displayed when it is smaller
than the entire window). */
- GtkAnchorType anchor;
+ GooCanvasAnchorType anchor;
/* Idle handler ID, for processing updates. */
guint idle_id;
diff --git a/src/goocanvastext.c b/src/goocanvastext.c
index 10508fe..7cb3c3b 100644
--- a/src/goocanvastext.c
+++ b/src/goocanvastext.c
@@ -157,8 +157,8 @@ goo_canvas_text_install_common_properties (GObjectClass *gobject_class)
g_param_spec_enum ("anchor",
_("Anchor"),
_("How to position the text relative to the given x and y coordinates"),
- GTK_TYPE_ANCHOR_TYPE,
- GTK_ANCHOR_NW,
+ GOO_TYPE_CANVAS_ANCHOR_TYPE,
+ GOO_CANVAS_ANCHOR_NW,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_ALIGN,
@@ -178,7 +178,7 @@ goo_canvas_text_init (GooCanvasText *text)
text->text_data = g_slice_new0 (GooCanvasTextData);
text->text_data->width = -1.0;
- text->text_data->anchor = GTK_ANCHOR_NW;
+ text->text_data->anchor = GOO_CANVAS_ANCHOR_NW;
text->text_data->ellipsize = PANGO_ELLIPSIZE_NONE;
text->text_data->wrap = PANGO_WRAP_WORD;
@@ -212,7 +212,7 @@ goo_canvas_text_init (GooCanvasText *text)
* of the text box placed at (500,500):
*
* <informalexample><programlisting>
- * GooCanvasItem *text = goo_canvas_text_new (mygroup, "Hello World", 500.0, 500.0, 200.0, GTK_ANCHOR_SE,
+ * GooCanvasItem *text = goo_canvas_text_new (mygroup, "Hello World", 500.0, 500.0, 200.0, GOO_CANVAS_ANCHOR_SE,
* "fill-color", "blue",
* NULL);
* </programlisting></informalexample>
@@ -225,7 +225,7 @@ goo_canvas_text_new (GooCanvasItem *parent,
gdouble x,
gdouble y,
gdouble width,
- GtkAnchorType anchor,
+ GooCanvasAnchorType anchor,
...)
{
GooCanvasItem *item;
@@ -500,14 +500,14 @@ goo_canvas_text_create_layout (GooCanvasItemSimpleData *simple_data,
switch (text_data->anchor)
{
- case GTK_ANCHOR_N:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_S:
+ case GOO_CANVAS_ANCHOR_N:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_S:
origin_x -= align_width / 2.0;
break;
- case GTK_ANCHOR_NE:
- case GTK_ANCHOR_E:
- case GTK_ANCHOR_SE:
+ case GOO_CANVAS_ANCHOR_NE:
+ case GOO_CANVAS_ANCHOR_E:
+ case GOO_CANVAS_ANCHOR_SE:
origin_x -= align_width;
break;
default:
@@ -516,14 +516,14 @@ goo_canvas_text_create_layout (GooCanvasItemSimpleData *simple_data,
switch (text_data->anchor)
{
- case GTK_ANCHOR_W:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_E:
+ case GOO_CANVAS_ANCHOR_W:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_E:
origin_y -= logical_height / 2.0;
break;
- case GTK_ANCHOR_SW:
- case GTK_ANCHOR_S:
- case GTK_ANCHOR_SE:
+ case GOO_CANVAS_ANCHOR_SW:
+ case GOO_CANVAS_ANCHOR_S:
+ case GOO_CANVAS_ANCHOR_SE:
origin_y -= logical_height;
break;
default:
@@ -950,7 +950,7 @@ goo_canvas_text_model_init (GooCanvasTextModel *tmodel)
GooCanvasTextPrivate *priv = GOO_CANVAS_TEXT_MODEL_GET_PRIVATE (tmodel);
tmodel->text_data.width = -1.0;
- tmodel->text_data.anchor = GTK_ANCHOR_NW;
+ tmodel->text_data.anchor = GOO_CANVAS_ANCHOR_NW;
tmodel->text_data.ellipsize = PANGO_ELLIPSIZE_NONE;
tmodel->text_data.wrap = PANGO_WRAP_WORD;
@@ -982,7 +982,7 @@ goo_canvas_text_model_init (GooCanvasTextModel *tmodel)
* of the text box placed at (500,500):
*
* <informalexample><programlisting>
- * GooCanvasItemModel *text = goo_canvas_text_model_new (mygroup, "Hello World", 500.0, 500.0, 200.0, GTK_ANCHOR_SE,
+ * GooCanvasItemModel *text = goo_canvas_text_model_new (mygroup, "Hello World", 500.0, 500.0, 200.0, GOO_CANVAS_ANCHOR_SE,
* "fill-color", "blue",
* NULL);
* </programlisting></informalexample>
@@ -995,7 +995,7 @@ goo_canvas_text_model_new (GooCanvasItemModel *parent,
gdouble x,
gdouble y,
gdouble width,
- GtkAnchorType anchor,
+ GooCanvasAnchorType anchor,
...)
{
GooCanvasItemModel *model;
diff --git a/src/goocanvastext.h b/src/goocanvastext.h
index 7d0ecbd..8569a48 100644
--- a/src/goocanvastext.h
+++ b/src/goocanvastext.h
@@ -20,7 +20,7 @@ struct _GooCanvasTextData
gchar *text;
gdouble x, y, width;
guint use_markup : 1;
- guint anchor : 5; /* GtkAnchorType */
+ guint anchor : 5; /* GooCanvasAnchorType */
guint alignment : 3; /* PangoAlignment */
guint ellipsize : 3; /* PangoEllipsizeMode */
guint wrap : 3; /* PangoWrapMode */
@@ -72,7 +72,7 @@ GooCanvasItem* goo_canvas_text_new (GooCanvasItem *parent,
gdouble x,
gdouble y,
gdouble width,
- GtkAnchorType anchor,
+ GooCanvasAnchorType anchor,
...);
void goo_canvas_text_get_natural_extents (GooCanvasText *text,
@@ -124,7 +124,7 @@ GooCanvasItemModel* goo_canvas_text_model_new (GooCanvasItemModel *parent,
gdouble x,
gdouble y,
gdouble width,
- GtkAnchorType anchor,
+ GooCanvasAnchorType anchor,
...);
diff --git a/src/goocanvasutils.h b/src/goocanvasutils.h
index 7f158d4..220ce9b 100644
--- a/src/goocanvasutils.h
+++ b/src/goocanvasutils.h
@@ -138,6 +138,29 @@ typedef enum
} GooCanvasPathCommandType;
+
+/* Anchor types */
+typedef enum
+{
+ GOO_CANVAS_ANCHOR_CENTER,
+ GOO_CANVAS_ANCHOR_NORTH,
+ GOO_CANVAS_ANCHOR_NORTH_WEST,
+ GOO_CANVAS_ANCHOR_NORTH_EAST,
+ GOO_CANVAS_ANCHOR_SOUTH,
+ GOO_CANVAS_ANCHOR_SOUTH_WEST,
+ GOO_CANVAS_ANCHOR_SOUTH_EAST,
+ GOO_CANVAS_ANCHOR_WEST,
+ GOO_CANVAS_ANCHOR_EAST,
+ GOO_CANVAS_ANCHOR_N = GOO_CANVAS_ANCHOR_NORTH,
+ GOO_CANVAS_ANCHOR_NW = GOO_CANVAS_ANCHOR_NORTH_WEST,
+ GOO_CANVAS_ANCHOR_NE = GOO_CANVAS_ANCHOR_NORTH_EAST,
+ GOO_CANVAS_ANCHOR_S = GOO_CANVAS_ANCHOR_SOUTH,
+ GOO_CANVAS_ANCHOR_SW = GOO_CANVAS_ANCHOR_SOUTH_WEST,
+ GOO_CANVAS_ANCHOR_SE = GOO_CANVAS_ANCHOR_SOUTH_EAST,
+ GOO_CANVAS_ANCHOR_W = GOO_CANVAS_ANCHOR_WEST,
+ GOO_CANVAS_ANCHOR_E = GOO_CANVAS_ANCHOR_EAST
+} GooCanvasAnchorType;
+
typedef union _GooCanvasPathCommand GooCanvasPathCommand;
/* Note that the command type is always the first element in each struct, so
diff --git a/src/goocanvaswidget.c b/src/goocanvaswidget.c
index 70adfc0..fdf8927 100644
--- a/src/goocanvaswidget.c
+++ b/src/goocanvaswidget.c
@@ -79,7 +79,7 @@ goo_canvas_widget_init (GooCanvasWidget *witem)
witem->y = 0.0;
witem->width = -1.0;
witem->height = -1.0;
- witem->anchor = GTK_ANCHOR_NW;
+ witem->anchor = GOO_CANVAS_ANCHOR_NW;
}
@@ -106,7 +106,7 @@ goo_canvas_widget_init (GooCanvasWidget *witem)
* GtkWidget *entry = gtk_entry_new ();
* GooCanvasItem *witem = goo_canvas_widget_new (mygroup, entry,
* 100, 100, -1, -1,
- * "anchor", GTK_ANCHOR_CENTER,
+ * "anchor", GOO_CANVAS_ANCHOR_CENTER,
* NULL);
* </programlisting></informalexample>
*
@@ -161,18 +161,18 @@ goo_canvas_widget_new (GooCanvasItem *parent,
/* Returns the anchor position, within the given width. */
static gdouble
-goo_canvas_widget_anchor_horizontal_pos (GtkAnchorType anchor,
+goo_canvas_widget_anchor_horizontal_pos (GooCanvasAnchorType anchor,
gdouble width)
{
switch(anchor)
{
- case GTK_ANCHOR_N:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_S:
+ case GOO_CANVAS_ANCHOR_N:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_S:
return width / 2.0;
- case GTK_ANCHOR_NE:
- case GTK_ANCHOR_E:
- case GTK_ANCHOR_SE:
+ case GOO_CANVAS_ANCHOR_NE:
+ case GOO_CANVAS_ANCHOR_E:
+ case GOO_CANVAS_ANCHOR_SE:
return width;
default:
return 0.0;
@@ -182,18 +182,18 @@ goo_canvas_widget_anchor_horizontal_pos (GtkAnchorType anchor,
/* Returns the anchor position, within the given height. */
static gdouble
-goo_canvas_widget_anchor_vertical_pos (GtkAnchorType anchor,
+goo_canvas_widget_anchor_vertical_pos (GooCanvasAnchorType anchor,
gdouble height)
{
switch (anchor)
{
- case GTK_ANCHOR_W:
- case GTK_ANCHOR_CENTER:
- case GTK_ANCHOR_E:
+ case GOO_CANVAS_ANCHOR_W:
+ case GOO_CANVAS_ANCHOR_CENTER:
+ case GOO_CANVAS_ANCHOR_E:
return height / 2.0;
- case GTK_ANCHOR_SW:
- case GTK_ANCHOR_S:
- case GTK_ANCHOR_SE:
+ case GOO_CANVAS_ANCHOR_SW:
+ case GOO_CANVAS_ANCHOR_S:
+ case GOO_CANVAS_ANCHOR_SE:
return height;
default:
return 0.0;
@@ -588,8 +588,8 @@ goo_canvas_widget_class_init (GooCanvasWidgetClass *klass)
g_param_spec_enum ("anchor",
_("Anchor"),
_("How to position the widget relative to the item's x and y coordinate settings"),
- GTK_TYPE_ANCHOR_TYPE,
- GTK_ANCHOR_NW,
+ GOO_TYPE_CANVAS_ANCHOR_TYPE,
+ GOO_CANVAS_ANCHOR_NW,
G_PARAM_READWRITE));
g_object_class_override_property (gobject_class, PROP_VISIBILITY,
diff --git a/src/goocanvaswidget.h b/src/goocanvaswidget.h
index 7d10fe2..48b7998 100644
--- a/src/goocanvaswidget.h
+++ b/src/goocanvaswidget.h
@@ -35,7 +35,7 @@ struct _GooCanvasWidget
GtkWidget *widget;
gdouble x, y, width, height;
- GtkAnchorType anchor;
+ GooCanvasAnchorType anchor;
};
struct _GooCanvasWidgetClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
