Mark abstract types as G_TYPE_FLAG_ABSTRACT. (#72383)

* gdk/gdkdraw.c (gdk_drawable_get_type):
	* gdk/gdkgc.c (gdk_gc_get_type):
	* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
	* gtk/gtkimcontext.c (gtk_im_context_get_type):
	* gtk/gtkprogress.c (gtk_progress_get_type):
	* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
	* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
	* gtk/gtkwidget.c (gtk_widget_get_type):
	* gtk/gtkseparator.c (gtk_separator_get_type):
	* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
	* gtk/gtkscale.c (gtk_scale_get_type):
	* gtk/gtkrange.c (gtk_range_get_type):
	* gtk/gtkpaned.c (gtk_paned_get_type):
	* gtk/gtkmisc.c (gtk_misc_get_type):
	* gtk/gtkitem.c (gtk_item_get_type):
	* gtk/gtkcontainer.c (gtk_container_get_type):
	* gtk/gtkbbox.c (gtk_button_box_get_type):
	* gtk/gtkbox.c (gtk_box_get_type):
	* gtk/gtkbin.c (gtk_bin_get_type):
	* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
	G_TYPE_FLAG_ABSTRACT.  (#72383)
This commit is contained in:
Matthias Clasen 2002-09-21 23:26:14 +00:00
parent d0cac48203
commit 083c3aef51
25 changed files with 316 additions and 127 deletions

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -1,3 +1,27 @@
2002-09-22 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_drawable_get_type):
* gdk/gdkgc.c (gdk_gc_get_type):
* gtk/gtkmenushell.c (gtk_menu_shell_get_type):
* gtk/gtkimcontext.c (gtk_im_context_get_type):
* gtk/gtkprogress.c (gtk_progress_get_type):
* gtk/gtkoldeditable.c (gtk_old_editable_get_type):
* gtk/gtkcellrenderer.c (gtk_cell_renderer_get_type):
* gtk/gtkwidget.c (gtk_widget_get_type):
* gtk/gtkseparator.c (gtk_separator_get_type):
* gtk/gtkscrollbar.c (gtk_scrollbar_get_type):
* gtk/gtkscale.c (gtk_scale_get_type):
* gtk/gtkrange.c (gtk_range_get_type):
* gtk/gtkpaned.c (gtk_paned_get_type):
* gtk/gtkmisc.c (gtk_misc_get_type):
* gtk/gtkitem.c (gtk_item_get_type):
* gtk/gtkcontainer.c (gtk_container_get_type):
* gtk/gtkbbox.c (gtk_button_box_get_type):
* gtk/gtkbox.c (gtk_box_get_type):
* gtk/gtkbin.c (gtk_bin_get_type):
* gtk/gtkobject.c (gtk_object_get_type): Mark abstract types as
G_TYPE_FLAG_ABSTRACT. (#72383)
2002-09-21 Tor Lillqvist <tml@iki.fi> 2002-09-21 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11 * gdk/win32/gdkselection-win32.c (sanitize_utf8): Copy from X11

View File

@ -81,7 +81,8 @@ gdk_drawable_get_type (void)
object_type = g_type_register_static (G_TYPE_OBJECT, object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkDrawable", "GdkDrawable",
&object_info, 0); &object_info,
G_TYPE_FLAG_ABSTRACT);
} }
return object_type; return object_type;

View File

@ -57,7 +57,8 @@ gdk_gc_get_type (void)
object_type = g_type_register_static (G_TYPE_OBJECT, object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkGC", "GdkGC",
&object_info, 0); &object_info,
G_TYPE_FLAG_ABSTRACT);
} }
return object_type; return object_type;

View File

@ -71,19 +71,22 @@ gtk_button_box_get_type (void)
if (!button_box_type) if (!button_box_type)
{ {
static const GtkTypeInfo button_box_info = static const GTypeInfo button_box_info =
{ {
"GtkButtonBox",
sizeof (GtkButtonBox),
sizeof (GtkButtonBoxClass), sizeof (GtkButtonBoxClass),
(GtkClassInitFunc) gtk_button_box_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_button_box_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_button_box_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return button_box_type;

View File

@ -50,19 +50,22 @@ gtk_bin_get_type (void)
if (!bin_type) if (!bin_type)
{ {
static const GtkTypeInfo bin_info = static const GTypeInfo bin_info =
{ {
"GtkBin",
sizeof (GtkBin),
sizeof (GtkBinClass), sizeof (GtkBinClass),
(GtkClassInitFunc) gtk_bin_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_bin_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_bin_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return bin_type;

View File

@ -83,19 +83,22 @@ gtk_box_get_type (void)
if (!box_type) if (!box_type)
{ {
static const GtkTypeInfo box_info = static const GTypeInfo box_info =
{ {
"GtkBox",
sizeof (GtkBox),
sizeof (GtkBoxClass), sizeof (GtkBoxClass),
(GtkClassInitFunc) gtk_box_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_box_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_box_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return box_type;

View File

@ -75,11 +75,13 @@ gtk_cell_renderer_get_type (void)
NULL, /* class_finalize */ NULL, /* class_finalize */
NULL, /* class_data */ NULL, /* class_data */
sizeof (GtkCellRenderer), sizeof (GtkCellRenderer),
0, 0, /* n_preallocs */
(GInstanceInitFunc) gtk_cell_renderer_init, (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; return cell_type;

View File

@ -131,7 +131,8 @@ gtk_container_get_type (void)
NULL, /* value_table */ 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; return container_type;

View File

@ -72,11 +72,11 @@ gtk_im_context_get_type (void)
sizeof (GtkIMContext), sizeof (GtkIMContext),
0, /* n_preallocs */ 0, /* n_preallocs */
(GInstanceInitFunc) gtk_im_context_init, (GInstanceInitFunc) gtk_im_context_init,
NULL /* value_table */
}; };
im_context_type = g_type_register_static (G_TYPE_OBJECT, im_context_type = g_type_register_static (G_TYPE_OBJECT, "GtkIMContext",
"GtkIMContext", &im_context_info, G_TYPE_FLAG_ABSTRACT);
&im_context_info, 0);
} }
return im_context_type; return im_context_type;

View File

@ -56,19 +56,22 @@ gtk_item_get_type (void)
if (!item_type) if (!item_type)
{ {
static const GtkTypeInfo item_info = static const GTypeInfo item_info =
{ {
"GtkItem",
sizeof (GtkItem),
sizeof (GtkItemClass), sizeof (GtkItemClass),
(GtkClassInitFunc) gtk_item_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_item_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_item_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return item_type;

View File

@ -164,19 +164,22 @@ gtk_menu_shell_get_type (void)
if (!menu_shell_type) if (!menu_shell_type)
{ {
static const GtkTypeInfo menu_shell_info = static const GTypeInfo menu_shell_info =
{ {
"GtkMenuShell",
sizeof (GtkMenuShell),
sizeof (GtkMenuShellClass), sizeof (GtkMenuShellClass),
(GtkClassInitFunc) gtk_menu_shell_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_menu_shell_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_menu_shell_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return menu_shell_type;

View File

@ -57,19 +57,22 @@ gtk_misc_get_type (void)
if (!misc_type) if (!misc_type)
{ {
static const GtkTypeInfo misc_info = static const GTypeInfo misc_info =
{ {
"GtkMisc",
sizeof (GtkMisc),
sizeof (GtkMiscClass), sizeof (GtkMiscClass),
(GtkClassInitFunc) gtk_misc_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_misc_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_misc_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return misc_type;

View File

@ -90,9 +90,11 @@ gtk_object_get_type (void)
sizeof (GtkObject), sizeof (GtkObject),
16, /* n_preallocs */ 16, /* n_preallocs */
(GInstanceInitFunc) gtk_object_init, (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; return object_type;

View File

@ -133,16 +133,18 @@ gtk_old_editable_get_type (void)
if (!old_editable_type) if (!old_editable_type)
{ {
static const GtkTypeInfo old_editable_info = static const GTypeInfo old_editable_info =
{ {
"GtkOldEditable",
sizeof (GtkOldEditable),
sizeof (GtkOldEditableClass), sizeof (GtkOldEditableClass),
(GtkClassInitFunc) gtk_old_editable_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_old_editable_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_old_editable_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, NULL, /* class_data */
sizeof (GtkOldEditable),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_old_editable_init,
NULL /* value_table */
}; };
static const GInterfaceInfo editable_info = static const GInterfaceInfo editable_info =
@ -152,7 +154,8 @@ gtk_old_editable_get_type (void)
NULL /* interface_data */ 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, g_type_add_interface_static (old_editable_type,
GTK_TYPE_EDITABLE, GTK_TYPE_EDITABLE,
&editable_info); &editable_info);

View File

@ -114,19 +114,22 @@ gtk_paned_get_type (void)
if (!paned_type) if (!paned_type)
{ {
static const GtkTypeInfo paned_info = static const GTypeInfo paned_info =
{ {
"GtkPaned",
sizeof (GtkPaned),
sizeof (GtkPanedClass), sizeof (GtkPanedClass),
(GtkClassInitFunc) gtk_paned_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_paned_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_paned_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return paned_type;

View File

@ -182,19 +182,22 @@ gtk_range_get_type (void)
if (!range_type) if (!range_type)
{ {
static const GtkTypeInfo range_info = static const GTypeInfo range_info =
{ {
"GtkRange",
sizeof (GtkRange),
sizeof (GtkRangeClass), sizeof (GtkRangeClass),
(GtkClassInitFunc) gtk_range_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_range_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_range_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return range_type;

View File

@ -76,19 +76,22 @@ gtk_scale_get_type (void)
if (!scale_type) if (!scale_type)
{ {
static const GtkTypeInfo scale_info = static const GTypeInfo scale_info =
{ {
"GtkScale",
sizeof (GtkScale),
sizeof (GtkScaleClass), sizeof (GtkScaleClass),
(GtkClassInitFunc) gtk_scale_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_scale_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_scale_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return scale_type;

View File

@ -42,19 +42,22 @@ gtk_scrollbar_get_type (void)
if (!scrollbar_type) if (!scrollbar_type)
{ {
static const GtkTypeInfo scrollbar_info = static const GTypeInfo scrollbar_info =
{ {
"GtkScrollbar",
sizeof (GtkScrollbar),
sizeof (GtkScrollbarClass), sizeof (GtkScrollbarClass),
(GtkClassInitFunc) gtk_scrollbar_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_scrollbar_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_scrollbar_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return scrollbar_type;

View File

@ -38,19 +38,22 @@ gtk_separator_get_type (void)
if (!separator_type) if (!separator_type)
{ {
static const GtkTypeInfo separator_info = static const GTypeInfo separator_info =
{ {
"GtkSeparator",
sizeof (GtkSeparator),
sizeof (GtkSeparatorClass), sizeof (GtkSeparatorClass),
(GtkClassInitFunc) gtk_separator_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_separator_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_separator_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, 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; return separator_type;

View File

@ -250,16 +250,18 @@ gtk_widget_get_type (void)
if (!widget_type) if (!widget_type)
{ {
static const GtkTypeInfo widget_info = static const GTypeInfo widget_info =
{ {
"GtkWidget",
sizeof (GtkWidget),
sizeof (GtkWidgetClass), sizeof (GtkWidgetClass),
(GtkClassInitFunc) gtk_widget_class_init, NULL, /* base_init */
(GtkObjectInitFunc) gtk_widget_init, NULL, /* base_finalize */
/* reserved_1 */ NULL, (GClassInitFunc) gtk_widget_class_init,
/* reserved_2 */ NULL, NULL, /* class_finalize */
(GtkClassInitFunc) NULL, NULL, /* class_data */
sizeof (GtkWidget),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_widget_init,
NULL, /* value_table */
}; };
static const GInterfaceInfo accessibility_info = static const GInterfaceInfo accessibility_info =
@ -269,8 +271,8 @@ gtk_widget_get_type (void)
NULL /* interface data */ NULL /* interface data */
}; };
widget_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkWidget",
widget_type = gtk_type_unique (GTK_TYPE_OBJECT, &widget_info); &widget_info, G_TYPE_FLAG_ABSTRACT);
g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR, g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
&accessibility_info) ; &accessibility_info) ;