diff options
| author | Tim Janik <timj@gtk.org> | 1998-06-08 03:38:24 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-06-08 03:38:24 +0000 |
| commit | 207eecc4240b2b296ad2f88c6377d19765135b84 (patch) | |
| tree | da3c726c0d2fe1fc400fe0458b56708353bd213e /gtk/gtkobject.h | |
| parent | 1e32cc3d6370b72add69c4a3c0ee4ecb8ca5b712 (diff) | |
| download | gtk+-207eecc4240b2b296ad2f88c6377d19765135b84.tar.gz | |
wrapped enum definitions with glib macros.
Mon Jun 8 02:52:37 1998 Tim Janik <timj@gtk.org>
* gdk/gdkprivate.h:
* gdk/gdktypes.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkobject.h: wrapped enum definitions with glib macros.
* reworked enum value array generation code. gtk.defs is a generated
file now.
Diffstat (limited to 'gtk/gtkobject.h')
| -rw-r--r-- | gtk/gtkobject.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index aea23a9353..8749fb41cf 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -100,12 +100,12 @@ extern "C" { */ typedef enum { - GTK_DESTROYED = 1 << 0, - GTK_FLOATING = 1 << 1, - GTK_CONNECTED = 1 << 2, - GTK_RESERVED_2 = 1 << 3, - GTK_OBJECT_FLAG_LAST = GTK_RESERVED_2 -} GtkObjectFlags; + G_NV (GTK_DESTROYED, destroyed, 1 << 0), + G_NV (GTK_FLOATING, floating, 1 << 1), + G_NV (GTK_CONNECTED, connected, 1 << 2), + GTK_RESERVED_2, + G_NV (GTK_OBJECT_FLAG_LAST, object-flag-last, GTK_RESERVED_2) +} G_FLAGS (GtkObjectFlags); /* Macros for extracting the object_flags from GtkObject. */ @@ -123,14 +123,14 @@ typedef enum */ typedef enum { - GTK_ARG_READABLE = 1 << 0, - GTK_ARG_WRITABLE = 1 << 1, - GTK_ARG_CONSTRUCT = 1 << 2, - GTK_ARG_MASK = 0x03, + G_NV (GTK_ARG_READABLE, readable, 1 << 0), + G_NV (GTK_ARG_WRITABLE, writable, 1 << 1), + G_NV (GTK_ARG_CONSTRUCT, construct, 1 << 2), + G_NV (GTK_ARG_MASK, mask, 0x03), /* aliases */ - GTK_ARG_READWRITE = GTK_ARG_READABLE | GTK_ARG_WRITABLE -} GtkArgFlags; + G_NV (GTK_ARG_READWRITE, readwrite, GTK_ARG_READABLE | GTK_ARG_WRITABLE) +} G_FLAGS (GtkArgFlags); typedef struct _GtkObjectClass GtkObjectClass; |