From 48a9f44f3172d362eab8a0084865b42084cef383 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 15 Jun 1998 21:27:17 +0000 Subject: gdk/gdktypes.h gdk/gdkprivate.h gtk/gtk*.h gtk/Makefile.am gtk/makenums.pl Mon Jun 15 16:29:45 1998 Owen Taylor * gdk/gdktypes.h gdk/gdkprivate.h gtk/gtk*.h gtk/Makefile.am gtk/makenums.pl Removed out the G_ENUM/FLAGS mechanism in favor of a perl script that parses the standard headers (with occasional /*< nick=foo >*/ style overrides) and extracts the enumerations. gtk/maketypes.awk: Small improvments to the translation of names. (Avoid splitting gc into g_c_.) Mon Jun 15 16:25:44 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtkfontsel.[ch] gtk/testgtk.c: Damon Chaplin's Font selection widget, and a simple example for testgtk. Mon Jun 15 15:58:34 1998 Owen Taylor * gtk/gtkentry.c: - Restored gtk_entry_adjust_scroll to static - Changed text positioning code so that we always display as large a portion of the text as possible. Mon Jun 15 15:42:12 1998 Owen Taylor * gtk/gtktext.c (gtk_text_finalize): Free internal structures of text widget. Also, unreference pixmaps when unrealizing. Sat Jun 13 19:14:39 1998 Owen Taylor * gdk/gdkinputcommon.h (gdk_input_device_new): Change 3.3.1 bug workaround to number keys starting at 1. Sat Jun 13 11:56:57 1998 Owen Taylor * docs/gtk_tut.sgml: Fixed urls for complete example source for scribble+widget-writing examples. --- gtk/gtkobject.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gtk/gtkobject.h') diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 271876b759..289e76a42b 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -100,12 +100,12 @@ extern "C" { */ typedef enum { - 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); + 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; /* Macros for extracting the object_flags from GtkObject. */ @@ -123,15 +123,14 @@ typedef enum */ typedef enum { - 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), + GTK_ARG_READABLE = 1 << 0, + GTK_ARG_WRITABLE = 1 << 1, + GTK_ARG_CONSTRUCT = 1 << 2, + GTK_ARG_MASK = 0x03, /* aliases */ - G_NV (GTK_ARG_READWRITE, readwrite, GTK_ARG_READABLE | GTK_ARG_WRITABLE) -} G_FLAGS (GtkArgFlags); - + GTK_ARG_READWRITE = GTK_ARG_READABLE | GTK_ARG_WRITABLE +} GtkArgFlags; typedef struct _GtkObjectClass GtkObjectClass; -- cgit v1.2.1