summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/canvas-arena.cpp22
-rw-r--r--src/display/canvas-arena.h2
-rw-r--r--src/display/canvas-bpath.cpp22
-rw-r--r--src/display/canvas-bpath.h2
-rw-r--r--src/display/canvas-grid.cpp24
-rw-r--r--src/display/canvas-grid.h2
-rw-r--r--src/display/canvas-text.cpp22
-rw-r--r--src/display/canvas-text.h2
-rw-r--r--src/display/gnome-canvas-acetate.cpp20
-rw-r--r--src/display/gnome-canvas-acetate.h2
-rw-r--r--src/display/sodipodi-ctrl.cpp4
-rw-r--r--src/display/sodipodi-ctrl.h2
-rw-r--r--src/display/sodipodi-ctrlrect.h2
-rw-r--r--src/display/sp-canvas-item.h2
-rw-r--r--src/display/sp-canvas.cpp2
15 files changed, 71 insertions, 61 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 72062ce99..5f3d961f7 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -48,20 +48,22 @@ NRArenaEventVector carenaev = {
static SPCanvasItemClass *parent_class;
static guint signals[LAST_SIGNAL] = {0};
-GtkType
+GType
sp_canvas_arena_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
- GtkTypeInfo info = {
- (gchar *)"SPCanvasArena",
- sizeof (SPCanvasArena),
+ GTypeInfo info = {
sizeof (SPCanvasArenaClass),
- (GtkClassInitFunc) sp_canvas_arena_class_init,
- (GtkObjectInitFunc) sp_canvas_arena_init,
- NULL, NULL, NULL
- };
- type = gtk_type_unique (SP_TYPE_CANVAS_ITEM, &info);
+ NULL, NULL,
+ (GClassInitFunc) sp_canvas_arena_class_init,
+ NULL, NULL,
+ sizeof (SPCanvasArena),
+ 0,
+ (GInstanceInitFunc) sp_canvas_arena_init,
+ NULL
+ };
+ type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasArena", &info, (GTypeFlags)0);
}
return type;
}
diff --git a/src/display/canvas-arena.h b/src/display/canvas-arena.h
index ef065a03b..4cfeccb5a 100644
--- a/src/display/canvas-arena.h
+++ b/src/display/canvas-arena.h
@@ -53,7 +53,7 @@ struct _SPCanvasArenaClass {
gint (* arena_event) (SPCanvasArena *carena, NRArenaItem *item, GdkEvent *event);
};
-GtkType sp_canvas_arena_get_type (void);
+GType sp_canvas_arena_get_type (void);
void sp_canvas_arena_set_pick_delta (SPCanvasArena *ca, gdouble delta);
void sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky);
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index f86743744..815892878 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -38,20 +38,22 @@ static double sp_canvas_bpath_point (SPCanvasItem *item, Geom::Point p, SPCanvas
static SPCanvasItemClass *parent_class;
-GtkType
+GType
sp_canvas_bpath_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
- GtkTypeInfo info = {
- (gchar *)"SPCanvasBPath",
- sizeof (SPCanvasBPath),
+ GTypeInfo info = {
sizeof (SPCanvasBPathClass),
- (GtkClassInitFunc) sp_canvas_bpath_class_init,
- (GtkObjectInitFunc) sp_canvas_bpath_init,
- NULL, NULL, NULL
- };
- type = gtk_type_unique (SP_TYPE_CANVAS_ITEM, &info);
+ NULL, NULL,
+ (GClassInitFunc) sp_canvas_bpath_class_init,
+ NULL, NULL,
+ sizeof (SPCanvasBPath),
+ 0,
+ (GInstanceInitFunc) sp_canvas_bpath_init,
+ NULL
+ };
+ type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasBPath", &info, (GTypeFlags)0);
}
return type;
}
diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
index ad19797c2..752ed73ea 100644
--- a/src/display/canvas-bpath.h
+++ b/src/display/canvas-bpath.h
@@ -90,7 +90,7 @@ struct SPCanvasBPathClass {
SPCanvasItemClass parent_class;
};
-GtkType sp_canvas_bpath_get_type (void);
+GType sp_canvas_bpath_get_type (void);
SPCanvasItem *sp_canvas_bpath_new (SPCanvasGroup *parent, SPCurve *curve);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 82ea036f6..9a12a1d90 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -58,22 +58,24 @@ static void grid_canvasitem_render (SPCanvasItem *item, SPCanvasBuf *buf);
static SPCanvasItemClass * parent_class;
-GtkType
+GType
grid_canvasitem_get_type (void)
{
- static GtkType grid_canvasitem_type = 0;
+ static GType grid_canvasitem_type = 0;
if (!grid_canvasitem_type) {
- GtkTypeInfo grid_canvasitem_info = {
- (gchar *)"GridCanvasItem",
- sizeof (GridCanvasItem),
+ GTypeInfo grid_canvasitem_info = {
sizeof (GridCanvasItemClass),
- (GtkClassInitFunc) grid_canvasitem_class_init,
- (GtkObjectInitFunc) grid_canvasitem_init,
- NULL, NULL,
- (GtkClassInitFunc) NULL
- };
- grid_canvasitem_type = gtk_type_unique (sp_canvas_item_get_type (), &grid_canvasitem_info);
+ NULL, NULL,
+ (GClassInitFunc) grid_canvasitem_class_init,
+ NULL, NULL,
+ sizeof (GridCanvasItem),
+ 0,
+ (GInstanceInitFunc) grid_canvasitem_init,
+ NULL
+ };
+
+ grid_canvasitem_type = g_type_register_static (sp_canvas_item_get_type (), "GridCanvasItem", &grid_canvasitem_info, (GTypeFlags)0);
}
return grid_canvasitem_type;
}
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index f42fecad7..160e4a4e2 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -57,7 +57,7 @@ struct GridCanvasItemClass {
};
/* Standard Gtk function */
-GtkType grid_canvasitem_get_type (void);
+GType grid_canvasitem_get_type (void);
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 842425f50..690015ecd 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -36,21 +36,23 @@ static void sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf);
static SPCanvasItemClass *parent_class_ct;
-GtkType
+GType
sp_canvastext_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type) {
- GtkTypeInfo info = {
- (gchar *)"SPCanvasText",
- sizeof (SPCanvasText),
+ GTypeInfo info = {
sizeof (SPCanvasTextClass),
- (GtkClassInitFunc) sp_canvastext_class_init,
- (GtkObjectInitFunc) sp_canvastext_init,
- NULL, NULL, NULL
- };
- type = gtk_type_unique (SP_TYPE_CANVAS_ITEM, &info);
+ NULL, NULL,
+ (GClassInitFunc) sp_canvastext_class_init,
+ NULL, NULL,
+ sizeof (SPCanvasText),
+ 0,
+ (GInstanceInitFunc) sp_canvastext_init,
+ NULL
+ };
+ type = g_type_register_static (SP_TYPE_CANVAS_ITEM, "SPCanvasText", &info, (GTypeFlags)0);
}
return type;
}
diff --git a/src/display/canvas-text.h b/src/display/canvas-text.h
index 30ddc1557..85333d84e 100644
--- a/src/display/canvas-text.h
+++ b/src/display/canvas-text.h
@@ -52,7 +52,7 @@ struct SPCanvasText : public SPCanvasItem {
};
struct SPCanvasTextClass : public SPCanvasItemClass{};
-GtkType sp_canvastext_get_type (void);
+GType sp_canvastext_get_type (void);
SPCanvasItem *sp_canvastext_new(SPCanvasGroup *parent, SPDesktop *desktop, Geom::Point pos, gchar const *text);
diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index b86892e32..67cc66950 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -25,20 +25,22 @@ static double sp_canvas_acetate_point (SPCanvasItem *item, Geom::Point p, SPCanv
static SPCanvasItemClass *parent_class;
-GtkType
+GType
sp_canvas_acetate_get_type (void)
{
- static GtkType acetate_type = 0;
+ static GType acetate_type = 0;
if (!acetate_type) {
- GtkTypeInfo acetate_info = {
- (gchar *)"SPCanvasAcetate",
- sizeof (SPCanvasAcetate),
+ GTypeInfo acetate_info = {
sizeof (SPCanvasAcetateClass),
- (GtkClassInitFunc) sp_canvas_acetate_class_init,
- (GtkObjectInitFunc) sp_canvas_acetate_init,
- NULL, NULL, NULL
+ NULL, NULL,
+ (GClassInitFunc) sp_canvas_acetate_class_init,
+ NULL, NULL,
+ sizeof (SPCanvasAcetate),
+ 0,
+ (GInstanceInitFunc) sp_canvas_acetate_init,
+ NULL
};
- acetate_type = gtk_type_unique (sp_canvas_item_get_type (), &acetate_info);
+ acetate_type = g_type_register_static (sp_canvas_item_get_type (), "SPCanvasAcetate", &acetate_info, (GTypeFlags)0);
}
return acetate_type;
}
diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h
index 756c663ca..ed6c99811 100644
--- a/src/display/gnome-canvas-acetate.h
+++ b/src/display/gnome-canvas-acetate.h
@@ -34,7 +34,7 @@ struct SPCanvasAcetateClass {
SPCanvasItemClass parent_class;
};
-GtkType sp_canvas_acetate_get_type (void);
+GType sp_canvas_acetate_get_type (void);
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index 5e939ffee..fe2a78a8f 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -40,10 +40,10 @@ static double sp_ctrl_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **a
static SPCanvasItemClass *parent_class;
-GtkType
+GType
sp_ctrl_get_type (void)
{
- static GtkType ctrl_type = 0;
+ static GType ctrl_type = 0;
if (!ctrl_type) {
static GTypeInfo const ctrl_info = {
sizeof (SPCtrlClass),
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index 3bf0889c7..4f114eac6 100644
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -62,7 +62,7 @@ struct SPCtrlClass : public SPCanvasItemClass{
/* Standard Gtk function */
-GtkType sp_ctrl_get_type (void);
+GType sp_ctrl_get_type (void);
#endif /* !INKSCAPE_CTRL_H */
diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
index 945deabc4..e69b6ba68 100644
--- a/src/display/sodipodi-ctrlrect.h
+++ b/src/display/sodipodi-ctrlrect.h
@@ -57,7 +57,7 @@ private:
struct SPCtrlRectClass : public SPCanvasItemClass {};
-GtkType sp_ctrlrect_get_type();
+GType sp_ctrlrect_get_type();
#endif // SEEN_RUBBERBAND_H
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index f62dc34a7..51e9a740e 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -67,7 +67,7 @@ struct _SPCanvasItemClass : public GtkObjectClass {
int (* event) (SPCanvasItem *item, GdkEvent *event);
};
-SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GtkType type, const gchar *first_arg_name, ...);
+SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GType type, const gchar *first_arg_name, ...);
G_END_DECLS
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 472c9ada5..0d56b0175 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -169,7 +169,7 @@ sp_canvas_item_init (SPCanvasItem *item)
* Constructs new SPCanvasItem on SPCanvasGroup.
*/
SPCanvasItem *
-sp_canvas_item_new (SPCanvasGroup *parent, GtkType type, gchar const *first_arg_name, ...)
+sp_canvas_item_new (SPCanvasGroup *parent, GType type, gchar const *first_arg_name, ...)
{
va_list args;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 23:00:10 +0000