diff options
author | Tim Janik <timj@gtk.org> | 1998-05-06 01:43:56 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-05-06 01:43:56 +0000 |
commit | 518a8a9c4ed18ea4571e3c9c43c1dbc387e6627b (patch) | |
tree | eb5b0af8fefd7e726af9b6d6d55d19f7f22997a9 /gtk/gtkcheckmenuitem.h | |
parent | c3e04d86ec5a4cd6eb6f62e89e63381f9a70d1fc (diff) | |
download | gtk+-518a8a9c4ed18ea4571e3c9c43c1dbc387e6627b.tar.gz |
reimplemented the signal storage system to use a linear array rather than
Wed May 6 02:16:34 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c: reimplemented the signal storage system to use a
linear array rather than a hash table.
be carefull *not* to keep any GtkSignal pointers across invokations
of gtk_signal_next_and_invalidate() and therefore gtk_signal_new[v]().
general code cleanups, made all allocations through memchunks.
(gtk_signal_lookup): we now do the lookup of signals through a key_id
for the signal names to avoid multiple hashing of the signal name on
lookups for the several hirarchy levels of an object.
Tue May 5 15:33:27 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): added gtk_signal_init() to avoid repeatedly
checking for signal initialization in gtksignal.c.
* gtk/gtktypeutils.c (TYPE_NODES_BLOCK_SIZE): reseted this to 200 after
a long debugging period ;)
Mon May 4 00:30:11 1998 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.h (GTK_TYPE_IS_A): new macro to speedup
gtk_type_is_a().
* gtk/gtktypeutils.c: reimplemented the type storage system to use a
linear array rather than a hash table. it actually speeded up testgtk
for a *considerable* amount. be carefull *not* to keep any GtkTypeNode
pointers across invokations of gtk_type_node_next_and_invalidate() and
therefore gtk_type_unique()!
* gtk/gtkobject.h (GTK_IS_OBJECT_CLASS): new macro to test for the
inheritance of a class pointer.
(GTK_OBJECT): modifications for speedups.
(GTK_IS_OBJECT): likewise.
(GTK_OBJECT_CLASS): likewise.
(suggested by owen).
* gtk/gtkcontainer.h (GTK_IS_CONTAINER_CLASS): new macro.
* gtk/gtkwidget.h (GTK_IS_WIDGET_CLASS): new macro.
* gtk/gtk.defs (GtkTooltips): define GtkTooltips as object not as boxed,
since its derivation changed 4 month ago ;(. showed up with the unique
type name checking code in gtk_type_unique().
* random guint->GtkType and macro fixups.
Diffstat (limited to 'gtk/gtkcheckmenuitem.h')
-rw-r--r-- | gtk/gtkcheckmenuitem.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index 4255c3060d..d6a07ea7a7 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -8,7 +8,7 @@ * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public @@ -26,12 +26,15 @@ #ifdef __cplusplus extern "C" { +#pragma } #endif /* __cplusplus */ -#define GTK_CHECK_MENU_ITEM(obj) ((GtkCheckMenuItem*) obj) -#define GTK_CHECK_MENU_ITEM_CLASS(obj) ((GtkCheckMenuItemClass*) GTK_OBJECT_CLASS (obj)) -#define GTK_IS_CHECK_MENU_ITEM(obj) (gtk_type_is_a (GTK_WIDGET_TYPE (obj), gtk_check_menu_item_get_type ())) +#define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ()) +#define GTK_CHECK_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem)) +#define GTK_CHECK_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItemClass)) +#define GTK_IS_CHECK_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM)) +#define GTK_IS_CHECK_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_MENU_ITEM)) typedef struct _GtkCheckMenuItem GtkCheckMenuItem; @@ -40,7 +43,7 @@ typedef struct _GtkCheckMenuItemClass GtkCheckMenuItemClass; struct _GtkCheckMenuItem { GtkMenuItem menu_item; - + guint active : 1; guint always_show_toggle : 1; }; @@ -48,21 +51,21 @@ struct _GtkCheckMenuItem struct _GtkCheckMenuItemClass { GtkMenuItemClass parent_class; - - void (* toggled) (GtkCheckMenuItem *check_menu_item); + + void (* toggled) (GtkCheckMenuItem *check_menu_item); void (* draw_indicator) (GtkCheckMenuItem *check_menu_item, - GdkRectangle *area); + GdkRectangle *area); }; -guint gtk_check_menu_item_get_type (void); -GtkWidget* gtk_check_menu_item_new (void); -GtkWidget* gtk_check_menu_item_new_with_label (const gchar *label); -void gtk_check_menu_item_set_state (GtkCheckMenuItem *check_menu_item, - gint state); +GtkType gtk_check_menu_item_get_type (void); +GtkWidget* gtk_check_menu_item_new (void); +GtkWidget* gtk_check_menu_item_new_with_label (const gchar *label); +void gtk_check_menu_item_set_state (GtkCheckMenuItem *check_menu_item, + gint state); void gtk_check_menu_item_set_show_toggle(GtkCheckMenuItem *menu_item, - gboolean always); -void gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item); + gboolean always); +void gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item); #ifdef __cplusplus |