summaryrefslogtreecommitdiff
path: root/gtk/gtkpacker.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@gtk.org>1998-06-15 21:27:17 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-06-15 21:27:17 +0000
commit48a9f44f3172d362eab8a0084865b42084cef383 (patch)
tree3b700a14292130d483e58d7c9164ee23826f1269 /gtk/gtkpacker.h
parente144ff2bb588d9e0f2c6237aaa6b9d4c3ec04d6e (diff)
downloadgtk+-48a9f44f3172d362eab8a0084865b42084cef383.tar.gz
gdk/gdktypes.h gdk/gdkprivate.h gtk/gtk*.h gtk/Makefile.am gtk/makenums.pl
Mon Jun 15 16:29:45 1998 Owen Taylor <otaylor@gtk.org> * 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 <otaylor@gtk.org> * gtk/Makefile.am gtk/gtk.h gtk/gtkfontsel.[ch] gtk/testgtk.c: Damon Chaplin's <DAChaplin@email.msn.com> Font selection widget, and a simple example for testgtk. Mon Jun 15 15:58:34 1998 Owen Taylor <otaylor@gtk.org> * 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 <otaylor@gtk.org> * 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 <otaylor@gtk.org> * 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 <otaylor@gtk.org> * docs/gtk_tut.sgml: Fixed urls for complete example source for scribble+widget-writing examples.
Diffstat (limited to 'gtk/gtkpacker.h')
-rw-r--r--gtk/gtkpacker.h59
1 files changed, 24 insertions, 35 deletions
diff --git a/gtk/gtkpacker.h b/gtk/gtkpacker.h
index b9bb87c653..b1c16e3569 100644
--- a/gtk/gtkpacker.h
+++ b/gtk/gtkpacker.h
@@ -43,41 +43,30 @@ typedef struct _GtkPacker GtkPacker;
typedef struct _GtkPackerClass GtkPackerClass;
typedef struct _GtkPackerChild GtkPackerChild;
-typedef enum
-{
- G_NV (GTK_PACK_EXPAND, pack-expand, 1 << 0),
- G_NV (GTK_FILL_X, fill-x, 1 << 1),
- G_NV (GTK_FILL_Y, fill-y, 1 << 2)
-} G_FLAGS (GtkPackerOptions);
-
-typedef enum
-{
- G_SV (GTK_SIDE_TOP, top),
- G_SV (GTK_SIDE_BOTTOM, bottom),
- G_SV (GTK_SIDE_LEFT, left),
- G_SV (GTK_SIDE_RIGHT, right)
-} G_ENUM (GtkSideType);
-
-typedef enum
-{
- G_SV (GTK_ANCHOR_CENTER, center),
- G_SV (GTK_ANCHOR_NORTH, north),
- G_SV (GTK_ANCHOR_NORTH_WEST, north-west),
- G_SV (GTK_ANCHOR_NORTH_EAST, north-east),
- G_SV (GTK_ANCHOR_SOUTH, south),
- G_SV (GTK_ANCHOR_SOUTH_WEST, south-west),
- G_SV (GTK_ANCHOR_SOUTH_EAST, south-east),
- G_SV (GTK_ANCHOR_WEST, west),
- G_SV (GTK_ANCHOR_EAST, east),
- GTK_ANCHOR_N = GTK_ANCHOR_NORTH,
- GTK_ANCHOR_NW = GTK_ANCHOR_NORTH_WEST,
- GTK_ANCHOR_NE = GTK_ANCHOR_NORTH_EAST,
- GTK_ANCHOR_S = GTK_ANCHOR_SOUTH,
- GTK_ANCHOR_SW = GTK_ANCHOR_SOUTH_WEST,
- GTK_ANCHOR_SE = GTK_ANCHOR_SOUTH_EAST,
- GTK_ANCHOR_W = GTK_ANCHOR_WEST,
- GTK_ANCHOR_E = GTK_ANCHOR_EAST
-} G_ENUM (GtkAnchorType);
+typedef enum {
+ GTK_PACK_EXPAND = 1 << 0, /*< nick=expand >*/
+ GTK_FILL_X = 1 << 1,
+ GTK_FILL_Y = 1 << 2
+} GtkPackerOptions;
+
+typedef enum {
+ GTK_SIDE_TOP,
+ GTK_SIDE_BOTTOM,
+ GTK_SIDE_LEFT,
+ GTK_SIDE_RIGHT
+} GtkSideType;
+
+typedef enum {
+ GTK_ANCHOR_CENTER,
+ GTK_ANCHOR_N,
+ GTK_ANCHOR_NW,
+ GTK_ANCHOR_NE,
+ GTK_ANCHOR_S,
+ GTK_ANCHOR_SW,
+ GTK_ANCHOR_SE,
+ GTK_ANCHOR_W,
+ GTK_ANCHOR_E
+} GtkAnchorType;
struct _GtkPackerChild
{