summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkbbox.c21
-rw-r--r--gtk/gtkbin.c21
-rw-r--r--gtk/gtkbox.c21
-rw-r--r--gtk/gtkcellrenderer.c6
-rw-r--r--gtk/gtkcontainer.c3
-rw-r--r--gtk/gtkimcontext.c6
-rw-r--r--gtk/gtkitem.c21
-rw-r--r--gtk/gtkmenushell.c21
-rw-r--r--gtk/gtkmisc.c21
-rw-r--r--gtk/gtkobject.c4
-rw-r--r--gtk/gtkoldeditable.c21
-rw-r--r--gtk/gtkpaned.c21
-rw-r--r--gtk/gtkrange.c21
-rw-r--r--gtk/gtkscale.c21
-rw-r--r--gtk/gtkscrollbar.c21
-rw-r--r--gtk/gtkseparator.c21
-rw-r--r--gtk/gtkwidget.c22
17 files changed, 168 insertions, 125 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index e03474121..b7167e4e0 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -71,19 +71,22 @@ gtk_button_box_get_type (void)
if (!button_box_type)
{
- static const GtkTypeInfo button_box_info =
+ static const GTypeInfo button_box_info =
{
- "GtkButtonBox",
- sizeof (GtkButtonBox),
sizeof (GtkButtonBoxClass),
- (GtkClassInitFunc) gtk_button_box_class_init,
- (GtkObjectInitFunc) gtk_button_box_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_button_box_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkButtonBox),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_button_box_init,
+ NULL, /* value_table */
};
- button_box_type = gtk_type_unique (gtk_box_get_type (), &button_box_info);
+ button_box_type = g_type_register_static (GTK_TYPE_BOX, "GtkButtonBox",
+ &button_box_info, G_TYPE_FLAG_ABSTRACT);
}
return button_box_type;
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index d8a80eeca..1f30f5292 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -50,19 +50,22 @@ gtk_bin_get_type (void)
if (!bin_type)
{
- static const GtkTypeInfo bin_info =
+ static const GTypeInfo bin_info =
{
- "GtkBin",
- sizeof (GtkBin),
sizeof (GtkBinClass),
- (GtkClassInitFunc) gtk_bin_class_init,
- (GtkObjectInitFunc) gtk_bin_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_bin_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkBin),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_bin_init,
+ NULL, /* value_table */
};
- bin_type = gtk_type_unique (GTK_TYPE_CONTAINER, &bin_info);
+ bin_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBin",
+ &bin_info, G_TYPE_FLAG_ABSTRACT);
}
return bin_type;
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 755886633..dda6b0f7f 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -83,19 +83,22 @@ gtk_box_get_type (void)
if (!box_type)
{
- static const GtkTypeInfo box_info =
+ static const GTypeInfo box_info =
{
- "GtkBox",
- sizeof (GtkBox),
sizeof (GtkBoxClass),
- (GtkClassInitFunc) gtk_box_class_init,
- (GtkObjectInitFunc) gtk_box_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_box_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkBox),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_box_init,
+ NULL, /* value_table */
};
- box_type = gtk_type_unique (GTK_TYPE_CONTAINER, &box_info);
+ box_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkBox",
+ &box_info, G_TYPE_FLAG_ABSTRACT);
}
return box_type;
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index d0fc40b17..470dfd583 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -75,11 +75,13 @@ gtk_cell_renderer_get_type (void)
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkCellRenderer),
- 0,
+ 0, /* n_preallocs */
(GInstanceInitFunc) gtk_cell_renderer_init,
+ NULL, /* value_table */
};
- cell_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkCellRenderer", &cell_info, 0);
+ cell_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkCellRenderer",
+ &cell_info, G_TYPE_FLAG_ABSTRACT);
}
return cell_type;
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b27548b03..bccb2dec2 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -131,7 +131,8 @@ gtk_container_get_type (void)
NULL, /* value_table */
};
- container_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer", &container_info, 0);
+ container_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkContainer",
+ &container_info, G_TYPE_FLAG_ABSTRACT);
}
return container_type;
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index 180d9d300..6a4d0eb60 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -72,11 +72,11 @@ gtk_im_context_get_type (void)
sizeof (GtkIMContext),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_im_context_init,
+ NULL /* value_table */
};
- im_context_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkIMContext",
- &im_context_info, 0);
+ im_context_type = g_type_register_static (G_TYPE_OBJECT, "GtkIMContext",
+ &im_context_info, G_TYPE_FLAG_ABSTRACT);
}
return im_context_type;
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 0038490ec..12186f5d7 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -56,19 +56,22 @@ gtk_item_get_type (void)
if (!item_type)
{
- static const GtkTypeInfo item_info =
+ static const GTypeInfo item_info =
{
- "GtkItem",
- sizeof (GtkItem),
sizeof (GtkItemClass),
- (GtkClassInitFunc) gtk_item_class_init,
- (GtkObjectInitFunc) gtk_item_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_item_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkItem),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_item_init,
+ NULL, /* value_table */
};
- item_type = gtk_type_unique (GTK_TYPE_BIN, &item_info);
+ item_type = g_type_register_static (GTK_TYPE_BIN, "GtkItem",
+ &item_info, G_TYPE_FLAG_ABSTRACT);
}
return item_type;
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 072bbb285..faa6a4078 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -164,19 +164,22 @@ gtk_menu_shell_get_type (void)
if (!menu_shell_type)
{
- static const GtkTypeInfo menu_shell_info =
+ static const GTypeInfo menu_shell_info =
{
- "GtkMenuShell",
- sizeof (GtkMenuShell),
sizeof (GtkMenuShellClass),
- (GtkClassInitFunc) gtk_menu_shell_class_init,
- (GtkObjectInitFunc) gtk_menu_shell_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_menu_shell_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkMenuShell),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_menu_shell_init,
+ NULL /* value_table */
};
- menu_shell_type = gtk_type_unique (gtk_container_get_type (), &menu_shell_info);
+ menu_shell_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkMenuShell",
+ &menu_shell_info, G_TYPE_FLAG_ABSTRACT);
}
return menu_shell_type;
diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index 210881a89..b45b2971d 100644
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -57,19 +57,22 @@ gtk_misc_get_type (void)
if (!misc_type)
{
- static const GtkTypeInfo misc_info =
+ static const GTypeInfo misc_info =
{
- "GtkMisc",
- sizeof (GtkMisc),
sizeof (GtkMiscClass),
- (GtkClassInitFunc) gtk_misc_class_init,
- (GtkObjectInitFunc) gtk_misc_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_misc_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkMisc),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_misc_init,
+ NULL, /* value_table */
};
- misc_type = gtk_type_unique (GTK_TYPE_WIDGET, &misc_info);
+ misc_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkMisc",
+ &misc_info, G_TYPE_FLAG_ABSTRACT);
}
return misc_type;
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 7af316c06..e520ed37d 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -90,9 +90,11 @@ gtk_object_get_type (void)
sizeof (GtkObject),
16, /* n_preallocs */
(GInstanceInitFunc) gtk_object_init,
+ NULL, /* value_table */
};
- object_type = g_type_register_static (G_TYPE_OBJECT, "GtkObject", &object_info, 0);
+ object_type = g_type_register_static (G_TYPE_OBJECT, "GtkObject",
+ &object_info, G_TYPE_FLAG_ABSTRACT);
}
return object_type;
diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 3016fd9c5..54b73370c 100644
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -133,16 +133,18 @@ gtk_old_editable_get_type (void)
if (!old_editable_type)
{
- static const GtkTypeInfo old_editable_info =
+ static const GTypeInfo old_editable_info =
{
- "GtkOldEditable",
- sizeof (GtkOldEditable),
sizeof (GtkOldEditableClass),
- (GtkClassInitFunc) gtk_old_editable_class_init,
- (GtkObjectInitFunc) gtk_old_editable_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_old_editable_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkOldEditable),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_old_editable_init,
+ NULL /* value_table */
};
static const GInterfaceInfo editable_info =
@@ -152,7 +154,8 @@ gtk_old_editable_get_type (void)
NULL /* interface_data */
};
- old_editable_type = gtk_type_unique (GTK_TYPE_WIDGET, &old_editable_info);
+ old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkOldEditable",
+ &old_editable_info, G_TYPE_FLAG_ABSTRACT);
g_type_add_interface_static (old_editable_type,
GTK_TYPE_EDITABLE,
&editable_info);
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 7e28dc7dd..cb078fb3e 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -114,19 +114,22 @@ gtk_paned_get_type (void)
if (!paned_type)
{
- static const GtkTypeInfo paned_info =
+ static const GTypeInfo paned_info =
{
- "GtkPaned",
- sizeof (GtkPaned),
sizeof (GtkPanedClass),
- (GtkClassInitFunc) gtk_paned_class_init,
- (GtkObjectInitFunc) gtk_paned_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_paned_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkPaned),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_paned_init,
+ NULL, /* value_table */
};
- paned_type = gtk_type_unique (GTK_TYPE_CONTAINER, &paned_info);
+ paned_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPaned",
+ &paned_info, G_TYPE_FLAG_ABSTRACT);
}
return paned_type;
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index e03978fff..e5b36f65d 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -182,19 +182,22 @@ gtk_range_get_type (void)
if (!range_type)
{
- static const GtkTypeInfo range_info =
+ static const GTypeInfo range_info =
{
- "GtkRange",
- sizeof (GtkRange),
sizeof (GtkRangeClass),
- (GtkClassInitFunc) gtk_range_class_init,
- (GtkObjectInitFunc) gtk_range_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_range_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkRange),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_range_init,
+ NULL, /* value_table */
};
- range_type = gtk_type_unique (GTK_TYPE_WIDGET, &range_info);
+ range_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkRange",
+ &range_info, G_TYPE_FLAG_ABSTRACT);
}
return range_type;
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index ce267eb68..6dfe0cf6d 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -76,19 +76,22 @@ gtk_scale_get_type (void)
if (!scale_type)
{
- static const GtkTypeInfo scale_info =
+ static const GTypeInfo scale_info =
{
- "GtkScale",
- sizeof (GtkScale),
sizeof (GtkScaleClass),
- (GtkClassInitFunc) gtk_scale_class_init,
- (GtkObjectInitFunc) gtk_scale_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_scale_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkScale),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_scale_init,
+ NULL, /* value_table */
};
- scale_type = gtk_type_unique (GTK_TYPE_RANGE, &scale_info);
+ scale_type = g_type_register_static (GTK_TYPE_RANGE, "GtkScale",
+ &scale_info, G_TYPE_FLAG_ABSTRACT);
}
return scale_type;
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 28e7ff694..df6da6067 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -42,19 +42,22 @@ gtk_scrollbar_get_type (void)
if (!scrollbar_type)
{
- static const GtkTypeInfo scrollbar_info =
+ static const GTypeInfo scrollbar_info =
{
- "GtkScrollbar",
- sizeof (GtkScrollbar),
sizeof (GtkScrollbarClass),
- (GtkClassInitFunc) gtk_scrollbar_class_init,
- (GtkObjectInitFunc) gtk_scrollbar_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_scrollbar_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkScrollbar),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_scrollbar_init,
+ NULL, /* value_table */
};
- scrollbar_type = gtk_type_unique (GTK_TYPE_RANGE, &scrollbar_info);
+ scrollbar_type = g_type_register_static (GTK_TYPE_RANGE, "GtkScrollbar",
+ &scrollbar_info, G_TYPE_FLAG_ABSTRACT);
}
return scrollbar_type;
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 2c3372d96..336f5ded0 100644
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -38,19 +38,22 @@ gtk_separator_get_type (void)
if (!separator_type)
{
- static const GtkTypeInfo separator_info =
+ static const GTypeInfo separator_info =
{
- "GtkSeparator",
- sizeof (GtkSeparator),
sizeof (GtkSeparatorClass),
- (GtkClassInitFunc) gtk_separator_class_init,
- (GtkObjectInitFunc) gtk_separator_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_separator_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkSeparator),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_separator_init,
+ NULL, /* value_table */
};
- separator_type = gtk_type_unique (GTK_TYPE_WIDGET, &separator_info);
+ separator_type = g_type_register_static (GTK_TYPE_WIDGET, "GtkSeparator",
+ &separator_info, G_TYPE_FLAG_ABSTRACT);
}
return separator_type;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f971937dd..0ed2acaa5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -250,16 +250,18 @@ gtk_widget_get_type (void)
if (!widget_type)
{
- static const GtkTypeInfo widget_info =
+ static const GTypeInfo widget_info =
{
- "GtkWidget",
- sizeof (GtkWidget),
sizeof (GtkWidgetClass),
- (GtkClassInitFunc) gtk_widget_class_init,
- (GtkObjectInitFunc) gtk_widget_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_widget_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkWidget),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_widget_init,
+ NULL, /* value_table */
};
static const GInterfaceInfo accessibility_info =
@@ -269,8 +271,8 @@ gtk_widget_get_type (void)
NULL /* interface data */
};
-
- widget_type = gtk_type_unique (GTK_TYPE_OBJECT, &widget_info);
+ widget_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkWidget",
+ &widget_info, G_TYPE_FLAG_ABSTRACT);
g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
&accessibility_info) ;
View Lorry Controller Status