summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/canvas-grid.cpp2
-rw-r--r--src/display/sp-canvas.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 1cc6e72ed..92a1b0fb8 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -311,7 +311,7 @@ CanvasGrid::createCanvasItem(SPDesktop * desktop)
item->grid = this;
sp_canvas_item_show(SP_CANVAS_ITEM(item));
- gtk_object_ref(GTK_OBJECT(item)); // since we're keeping a link to this item, we need to bump up the ref count
+ g_object_ref(item); // since we're keeping a link to this item, we need to bump up the ref count
canvasitems = g_slist_prepend(canvasitems, item);
return item;
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index e5be4f8a9..f352133e5 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1078,7 +1078,7 @@ void SPCanvasGroup::viewboxChanged(SPCanvasItem *item, Geom::IntRect const &new_
void SPCanvasGroup::add(SPCanvasItem *item)
{
- gtk_object_ref( GTK_OBJECT(item) );
+ g_object_ref(item);
g_object_ref_sink(item);
if (!items) {
@@ -1181,7 +1181,7 @@ void SPCanvasImpl::init(SPCanvas *canvas)
canvas->root = SP_CANVAS_ITEM(g_object_new(SPCanvasGroup::getType(), NULL));
canvas->root->canvas = canvas;
- gtk_object_ref (GTK_OBJECT (canvas->root));
+ g_object_ref (canvas->root);
g_object_ref_sink (canvas->root);
canvas->need_repick = TRUE;
@@ -1484,7 +1484,7 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event)
gint finished = FALSE;
while (item && !finished) {
- gtk_object_ref (GTK_OBJECT (item));
+ g_object_ref (item);
g_signal_emit (G_OBJECT (item), item_signals[ITEM_EVENT], 0, &ev, &finished);
SPCanvasItem *parent = item->parent;
g_object_unref (item);