From 44a70fc239d2d7aeaa7f03184ede08c800dae9e5 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 30 Oct 2001 00:24:08 +0000 Subject: [PATCH] Code cleanup. (gtk_separator_menu_item_class_init): Fix bugs in this code. Mon Oct 29 19:18:35 2001 Jonathan Blandford * gtk/gtkseparatormenuitem.c: Code cleanup. (gtk_separator_menu_item_class_init): Fix bugs in this code. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkseparatormenuitem.c | 40 +++++++++++++++++++------------------- gtk/gtkseparatormenuitem.h | 2 +- 9 files changed, 56 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7b7e196d45..39fb506f94 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Oct 29 19:18:35 2001 Jonathan Blandford + + * gtk/gtkseparatormenuitem.c: Code cleanup. + (gtk_separator_menu_item_class_init): Fix bugs in this code. + 2001-10-29 jacob berkman * gdk/Makefile.am (LDFLAGS): diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c index 77b6b06d20..3d8d570745 100644 --- a/gtk/gtkseparatormenuitem.c +++ b/gtk/gtkseparatormenuitem.c @@ -21,49 +21,49 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #include "gtkseparatormenuitem.h" -static void gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *klass); +static void gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class); -static GtkMenuItemClass *parent_class; - -GtkType +GType gtk_separator_menu_item_get_type (void) { - static GtkType separator_menu_item_type = 0; + static GType separator_menu_item_type = 0; if (!separator_menu_item_type) { static const GTypeInfo separator_menu_item_info = { - sizeof (GtkSeparatorMenuItemClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_separator_menu_item_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkSeparatorMenuItem), - 16, /* n_preallocs */ - (GInstanceInitFunc) NULL, + sizeof (GtkSeparatorMenuItemClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_separator_menu_item_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkSeparatorMenuItem), + 0, /* n_preallocs */ + NULL, /* instance_init */ }; - separator_menu_item_type = g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkSeparatorMenuItem", &separator_menu_item_info, 0); + separator_menu_item_type = + g_type_register_static (GTK_TYPE_MENU_ITEM, "GtkSeparatorMenuItem", + &separator_menu_item_info, 0); } return separator_menu_item_type; } static void -gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *klass) +gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class) { - parent_class = gtk_type_class (gtk_menu_item_get_type ()); + GTK_CONTAINER_CLASS (class)->child_type = NULL; } -GtkWidget* +GtkWidget * gtk_separator_menu_item_new (void) { - return GTK_WIDGET (gtk_type_new (gtk_separator_menu_item_get_type ())); + return g_object_new (GTK_TYPE_SEPARATOR_MENU_ITEM, NULL); } diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index 7b6a551952..b34eccbcff 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/gtk/gtkseparatormenuitem.h @@ -58,7 +58,7 @@ struct _GtkSeparatorMenuItemClass }; -GtkType gtk_separator_menu_item_get_type (void) G_GNUC_CONST; +GType gtk_separator_menu_item_get_type (void) G_GNUC_CONST; GtkWidget* gtk_separator_menu_item_new (void);