port to G_DEFINE_TYPE() and friends. Some related cleanup.

2005-12-19  Michael Natterer  <mitch@gimp.org>

	* app/widgets/*.c: port to G_DEFINE_TYPE() and friends. Some
	related cleanup.
This commit is contained in:
Michael Natterer
2005-12-19 22:37:49 +00:00
committed by Michael Natterer
parent b53e627eb9
commit 61df53ec54
114 changed files with 945 additions and 4393 deletions

View File

@ -51,10 +51,7 @@ enum
};
static void gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass);
static void gimp_container_grid_view_init (GimpContainerGridView *view);
static void gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *view_iface);
static void gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *iface);
static gboolean gimp_container_grid_view_move_cursor (GimpContainerGridView *view,
GtkMovementStep step,
@ -100,7 +97,13 @@ static gboolean gimp_container_grid_view_button_press (GtkWidget *w
GimpContainerGridView *view);
static GimpContainerBoxClass *parent_class = NULL;
G_DEFINE_TYPE_WITH_CODE (GimpContainerGridView, gimp_container_grid_view,
GIMP_TYPE_CONTAINER_BOX,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONTAINER_VIEW,
gimp_container_grid_view_view_iface_init));
#define parent_class gimp_container_grid_view_parent_class
static GimpContainerViewInterface *parent_view_iface = NULL;
static guint grid_view_signals[LAST_SIGNAL] = { 0 };
@ -109,51 +112,12 @@ static GimpRGB white_color;
static GimpRGB black_color;
GType
gimp_container_grid_view_get_type (void)
{
static GType view_type = 0;
if (! view_type)
{
static const GTypeInfo view_info =
{
sizeof (GimpContainerGridViewClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gimp_container_grid_view_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpContainerGridView),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_container_grid_view_init,
};
static const GInterfaceInfo view_iface_info =
{
(GInterfaceInitFunc) gimp_container_grid_view_view_iface_init,
NULL, /* iface_finalize */
NULL /* iface_data */
};
view_type = g_type_register_static (GIMP_TYPE_CONTAINER_BOX,
"GimpContainerGridView",
&view_info, 0);
g_type_add_interface_static (view_type, GIMP_TYPE_CONTAINER_VIEW,
&view_iface_info);
}
return view_type;
}
static void
gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GtkBindingSet *binding_set;
parent_class = g_type_class_peek_parent (klass);
binding_set = gtk_binding_set_by_class (klass);
widget_class->focus = gimp_container_grid_view_focus;
@ -228,17 +192,17 @@ gimp_container_grid_view_init (GimpContainerGridView *grid_view)
}
static void
gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *view_iface)
gimp_container_grid_view_view_iface_init (GimpContainerViewInterface *iface)
{
parent_view_iface = g_type_interface_peek_parent (view_iface);
parent_view_iface = g_type_interface_peek_parent (iface);
view_iface->insert_item = gimp_container_grid_view_insert_item;
view_iface->remove_item = gimp_container_grid_view_remove_item;
view_iface->reorder_item = gimp_container_grid_view_reorder_item;
view_iface->rename_item = gimp_container_grid_view_rename_item;
view_iface->select_item = gimp_container_grid_view_select_item;
view_iface->clear_items = gimp_container_grid_view_clear_items;
view_iface->set_preview_size = gimp_container_grid_view_set_preview_size;
iface->insert_item = gimp_container_grid_view_insert_item;
iface->remove_item = gimp_container_grid_view_remove_item;
iface->reorder_item = gimp_container_grid_view_reorder_item;
iface->rename_item = gimp_container_grid_view_rename_item;
iface->select_item = gimp_container_grid_view_select_item;
iface->clear_items = gimp_container_grid_view_clear_items;
iface->set_preview_size = gimp_container_grid_view_set_preview_size;
}
GtkWidget *