[gtkmm] Regenerated enum .defs files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Regenerated enum .defs files.
- Date: Tue, 6 Sep 2011 09:23:34 +0000 (UTC)
commit ea7f717104c9ea6fd122a142fe11dd1276915c34
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Sep 6 10:31:20 2011 +0200
Regenerated enum .defs files.
* gdk/src/gdk_enums.defs:
* gtk/src/gtk_enums.defs:
Regenerated with enums.pl
Apparently we did not regenerate these recently before 3.0.0.
There is a (then late) change in GdkDragProtocol that actually changes
the enum values. This is technically an ABI break, but we would be passing
the wrong values to the C functions, leading to already incorrect behaviour,
so this can only be an improvement.
This also removes other enums from the .defs that we do not use any more in
the actual API.
ChangeLog | 15 ++
gdk/src/gdk_enums.defs | 480 +++++++-----------------------------------------
gtk/src/gtk_enums.defs | 30 +++
3 files changed, 109 insertions(+), 416 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5689462..723e3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2011-09-06 Murray Cumming <murrayc murrayc com>
+ Regenerated enum .defs files.
+
+ * gdk/src/gdk_enums.defs:
+ * gtk/src/gtk_enums.defs:
+ Regenerated with enums.pl
+ Apparently we did not regenerate these recently before 3.0.0.
+ There is a (then late) change in GdkDragProtocol that actually changes
+ the enum values. This is technically an ABI break, but we would be passing
+ the wrong values to the C functions, leading to already incorrect behaviour,
+ so this can only be an improvement.
+ This also removes other enums from the .defs that we do not use any more in
+ the actual API.
+
+2011-09-06 Murray Cumming <murrayc murrayc com>
+
Assistant: Added remove_page().
* gtk/src/assistant.hg: Wrapping the new gtk_assistant_remove_page()
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 4fc6ca0..a3fa168 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -306,24 +306,23 @@
;; Original typedef:
;; typedef enum
;; {
+;; GDK_DRAG_PROTO_NONE = 0,
;; GDK_DRAG_PROTO_MOTIF,
;; GDK_DRAG_PROTO_XDND,
-;; GDK_DRAG_PROTO_ROOTWIN, /* A root window with nobody claiming
-;; * drags */
-;; GDK_DRAG_PROTO_NONE, /* Not a valid drag window */
-;; GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
-;; GDK_DRAG_PROTO_OLE2, /* The complex OLE2 dnd (not implemented) */
-;; GDK_DRAG_PROTO_LOCAL /* Intra-app */
+;; GDK_DRAG_PROTO_ROOTWIN,
+;; GDK_DRAG_PROTO_WIN32_DROPFILES,
+;; GDK_DRAG_PROTO_OLE2,
+;; GDK_DRAG_PROTO_LOCAL
;; } GdkDragProtocol;
(define-enum-extended DragProtocol
(in-module "Gdk")
(c-name "GdkDragProtocol")
(values
- '("motif" "GDK_DRAG_PROTO_MOTIF" "0")
- '("xdnd" "GDK_DRAG_PROTO_XDND" "1")
- '("rootwin" "GDK_DRAG_PROTO_ROOTWIN" "2")
- '("none" "GDK_DRAG_PROTO_NONE" "3")
+ '("none" "GDK_DRAG_PROTO_NONE" "0")
+ '("motif" "GDK_DRAG_PROTO_MOTIF" "1")
+ '("xdnd" "GDK_DRAG_PROTO_XDND" "2")
+ '("rootwin" "GDK_DRAG_PROTO_ROOTWIN" "3")
'("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "4")
'("ole2" "GDK_DRAG_PROTO_OLE2" "5")
'("local" "GDK_DRAG_PROTO_LOCAL" "6")
@@ -385,7 +384,6 @@
;; GDK_DROP_FINISHED = 27,
;; GDK_CLIENT_EVENT = 28,
;; GDK_VISIBILITY_NOTIFY = 29,
-;; GDK_NO_EXPOSE = 30,
;; GDK_SCROLL = 31,
;; GDK_WINDOW_STATE = 32,
;; GDK_SETTING = 33,
@@ -430,7 +428,6 @@
'("drop-finished" "GDK_DROP_FINISHED" "27")
'("client-event" "GDK_CLIENT_EVENT" "28")
'("visibility-notify" "GDK_VISIBILITY_NOTIFY" "29")
- '("no-expose" "GDK_NO_EXPOSE" "30")
'("scroll" "GDK_SCROLL" "31")
'("window-state" "GDK_WINDOW_STATE" "32")
'("setting" "GDK_SETTING" "33")
@@ -605,327 +602,6 @@
)
)
-;; From gdkfont.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_FONT_FONT,
-;; GDK_FONT_FONTSET
-;; } GdkFontType;
-
-(define-enum-extended FontType
- (in-module "Gdk")
- (c-name "GdkFontType")
- (values
- '("font" "GDK_FONT_FONT" "0")
- '("fontset" "GDK_FONT_FONTSET" "1")
- )
-)
-
-;; From gdkgc.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_CAP_NOT_LAST,
-;; GDK_CAP_BUTT,
-;; GDK_CAP_ROUND,
-;; GDK_CAP_PROJECTING
-;; } GdkCapStyle;
-
-(define-enum-extended CapStyle
- (in-module "Gdk")
- (c-name "GdkCapStyle")
- (values
- '("not-last" "GDK_CAP_NOT_LAST" "0")
- '("butt" "GDK_CAP_BUTT" "1")
- '("round" "GDK_CAP_ROUND" "2")
- '("projecting" "GDK_CAP_PROJECTING" "3")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_SOLID,
-;; GDK_TILED,
-;; GDK_STIPPLED,
-;; GDK_OPAQUE_STIPPLED
-;; } GdkFill;
-
-(define-enum-extended Fill
- (in-module "Gdk")
- (c-name "GdkFill")
- (values
- '("solid" "GDK_SOLID" "0")
- '("tiled" "GDK_TILED" "1")
- '("stippled" "GDK_STIPPLED" "2")
- '("opaque-stippled" "GDK_OPAQUE_STIPPLED" "3")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_COPY,
-;; GDK_INVERT,
-;; GDK_XOR,
-;; GDK_CLEAR,
-;; GDK_AND,
-;; GDK_AND_REVERSE,
-;; GDK_AND_INVERT,
-;; GDK_NOOP,
-;; GDK_OR,
-;; GDK_EQUIV,
-;; GDK_OR_REVERSE,
-;; GDK_COPY_INVERT,
-;; GDK_OR_INVERT,
-;; GDK_NAND,
-;; GDK_NOR,
-;; GDK_SET
-;; } GdkFunction;
-
-(define-enum-extended Function
- (in-module "Gdk")
- (c-name "GdkFunction")
- (values
- '("copy" "GDK_COPY" "0")
- '("invert" "GDK_INVERT" "1")
- '("xor" "GDK_XOR" "2")
- '("clear" "GDK_CLEAR" "3")
- '("and" "GDK_AND" "4")
- '("and-reverse" "GDK_AND_REVERSE" "5")
- '("and-invert" "GDK_AND_INVERT" "6")
- '("noop" "GDK_NOOP" "7")
- '("or" "GDK_OR" "8")
- '("equiv" "GDK_EQUIV" "9")
- '("or-reverse" "GDK_OR_REVERSE" "10")
- '("copy-invert" "GDK_COPY_INVERT" "11")
- '("or-invert" "GDK_OR_INVERT" "12")
- '("nand" "GDK_NAND" "13")
- '("nor" "GDK_NOR" "14")
- '("set" "GDK_SET" "15")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_JOIN_MITER,
-;; GDK_JOIN_ROUND,
-;; GDK_JOIN_BEVEL
-;; } GdkJoinStyle;
-
-(define-enum-extended JoinStyle
- (in-module "Gdk")
- (c-name "GdkJoinStyle")
- (values
- '("miter" "GDK_JOIN_MITER" "0")
- '("round" "GDK_JOIN_ROUND" "1")
- '("bevel" "GDK_JOIN_BEVEL" "2")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_LINE_SOLID,
-;; GDK_LINE_ON_OFF_DASH,
-;; GDK_LINE_DOUBLE_DASH
-;; } GdkLineStyle;
-
-(define-enum-extended LineStyle
- (in-module "Gdk")
- (c-name "GdkLineStyle")
- (values
- '("solid" "GDK_LINE_SOLID" "0")
- '("on-off-dash" "GDK_LINE_ON_OFF_DASH" "1")
- '("double-dash" "GDK_LINE_DOUBLE_DASH" "2")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_CLIP_BY_CHILDREN = 0,
-;; GDK_INCLUDE_INFERIORS = 1
-;; } GdkSubwindowMode;
-
-(define-enum-extended SubwindowMode
- (in-module "Gdk")
- (c-name "GdkSubwindowMode")
- (values
- '("clip-by-children" "GDK_CLIP_BY_CHILDREN" "0")
- '("include-inferiors" "GDK_INCLUDE_INFERIORS" "1")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_GC_FOREGROUND = 1 << 0,
-;; GDK_GC_BACKGROUND = 1 << 1,
-;; GDK_GC_FONT = 1 << 2,
-;; GDK_GC_FUNCTION = 1 << 3,
-;; GDK_GC_FILL = 1 << 4,
-;; GDK_GC_TILE = 1 << 5,
-;; GDK_GC_STIPPLE = 1 << 6,
-;; GDK_GC_CLIP_MASK = 1 << 7,
-;; GDK_GC_SUBWINDOW = 1 << 8,
-;; GDK_GC_TS_X_ORIGIN = 1 << 9,
-;; GDK_GC_TS_Y_ORIGIN = 1 << 10,
-;; GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-;; GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-;; GDK_GC_EXPOSURES = 1 << 13,
-;; GDK_GC_LINE_WIDTH = 1 << 14,
-;; GDK_GC_LINE_STYLE = 1 << 15,
-;; GDK_GC_CAP_STYLE = 1 << 16,
-;; GDK_GC_JOIN_STYLE = 1 << 17
-;; } GdkGCValuesMask;
-
-(define-flags-extended GCValuesMask
- (in-module "Gdk")
- (c-name "GdkGCValuesMask")
- (values
- '("foreground" "GDK_GC_FOREGROUND" "1 << 0")
- '("background" "GDK_GC_BACKGROUND" "1 << 1")
- '("font" "GDK_GC_FONT" "1 << 2")
- '("function" "GDK_GC_FUNCTION" "1 << 3")
- '("fill" "GDK_GC_FILL" "1 << 4")
- '("tile" "GDK_GC_TILE" "1 << 5")
- '("stipple" "GDK_GC_STIPPLE" "1 << 6")
- '("clip-mask" "GDK_GC_CLIP_MASK" "1 << 7")
- '("subwindow" "GDK_GC_SUBWINDOW" "1 << 8")
- '("ts-x-origin" "GDK_GC_TS_X_ORIGIN" "1 << 9")
- '("ts-y-origin" "GDK_GC_TS_Y_ORIGIN" "1 << 10")
- '("clip-x-origin" "GDK_GC_CLIP_X_ORIGIN" "1 << 11")
- '("clip-y-origin" "GDK_GC_CLIP_Y_ORIGIN" "1 << 12")
- '("exposures" "GDK_GC_EXPOSURES" "1 << 13")
- '("line-width" "GDK_GC_LINE_WIDTH" "1 << 14")
- '("line-style" "GDK_GC_LINE_STYLE" "1 << 15")
- '("cap-style" "GDK_GC_CAP_STYLE" "1 << 16")
- '("join-style" "GDK_GC_JOIN_STYLE" "1 << 17")
- )
-)
-
-;; From gdkimage.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_IMAGE_NORMAL,
-;; GDK_IMAGE_SHARED,
-;; GDK_IMAGE_FASTEST
-;; } GdkImageType;
-
-(define-enum-extended ImageType
- (in-module "Gdk")
- (c-name "GdkImageType")
- (values
- '("normal" "GDK_IMAGE_NORMAL" "0")
- '("shared" "GDK_IMAGE_SHARED" "1")
- '("fastest" "GDK_IMAGE_FASTEST" "2")
- )
-)
-
-;; From gdkinternals.h
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_COLOR_WRITEABLE = 1 << 0
-;; } GdkColorInfoFlags;
-
-(define-flags-extended ColorInfoFlags
- (in-module "Gdk")
- (c-name "GdkColorInfoFlags")
- (values
- '("writeable" "GDK_COLOR_WRITEABLE" "1 << 0")
- )
-)
-
-;; Original typedef:
-;; typedef enum {
-;; GDK_DEBUG_MISC = 1 << 0,
-;; GDK_DEBUG_EVENTS = 1 << 1,
-;; GDK_DEBUG_DND = 1 << 2,
-;; GDK_DEBUG_XIM = 1 << 3,
-;; GDK_DEBUG_NOGRABS = 1 << 4,
-;; GDK_DEBUG_COLORMAP = 1 << 5,
-;; GDK_DEBUG_GDKRGB = 1 << 6,
-;; GDK_DEBUG_GC = 1 << 7,
-;; GDK_DEBUG_PIXMAP = 1 << 8,
-;; GDK_DEBUG_IMAGE = 1 << 9,
-;; GDK_DEBUG_INPUT = 1 <<10,
-;; GDK_DEBUG_CURSOR = 1 <<11,
-;; GDK_DEBUG_MULTIHEAD = 1 <<12,
-;; GDK_DEBUG_XINERAMA = 1 <<13,
-;; GDK_DEBUG_DRAW = 1 <<14,
-;; GDK_DEBUG_EVENTLOOP = 1 <<15
-;; } GdkDebugFlag;
-
-(define-flags-extended DebugFlag
- (in-module "Gdk")
- (c-name "GdkDebugFlag")
- (values
- '("misc" "GDK_DEBUG_MISC" "1 << 0")
- '("events" "GDK_DEBUG_EVENTS" "1 << 1")
- '("dnd" "GDK_DEBUG_DND" "1 << 2")
- '("xim" "GDK_DEBUG_XIM" "1 << 3")
- '("nograbs" "GDK_DEBUG_NOGRABS" "1 << 4")
- '("colormap" "GDK_DEBUG_COLORMAP" "1 << 5")
- '("gdkrgb" "GDK_DEBUG_GDKRGB" "1 << 6")
- '("gc" "GDK_DEBUG_GC" "1 << 7")
- '("pixmap" "GDK_DEBUG_PIXMAP" "1 << 8")
- '("image" "GDK_DEBUG_IMAGE" "1 << 9")
- '("input" "GDK_DEBUG_INPUT" "1 <<10")
- '("cursor" "GDK_DEBUG_CURSOR" "1 <<11")
- '("multihead" "GDK_DEBUG_MULTIHEAD" "1 <<12")
- '("xinerama" "GDK_DEBUG_XINERAMA" "1 <<13")
- '("draw" "GDK_DEBUG_DRAW" "1 <<14")
- '("eventloop" "GDK_DEBUG_EVENTLOOP" "1 <<15")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_ARG_STRING,
-;; GDK_ARG_INT,
-;; GDK_ARG_BOOL,
-;; GDK_ARG_NOBOOL,
-;; GDK_ARG_CALLBACK
-;; } GdkArgType;
-
-(define-enum-extended ArgType
- (in-module "Gdk")
- (c-name "GdkArgType")
- (values
- '("string" "GDK_ARG_STRING" "0")
- '("int" "GDK_ARG_INT" "1")
- '("bool" "GDK_ARG_BOOL" "2")
- '("nobool" "GDK_ARG_NOBOOL" "3")
- '("callback" "GDK_ARG_CALLBACK" "4")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; /* Following flag is set for events on the event queue during
-;; * translation and cleared afterwards.
-;; */
-;; GDK_EVENT_PENDING = 1 << 0
-;; } GdkEventFlags;
-
-(define-flags-extended EventFlags
- (in-module "Gdk")
- (c-name "GdkEventFlags")
- (values
- '("pending" "GDK_EVENT_PENDING" "1 << 0")
- )
-)
-
;; From gdkproperty.h
;; Original typedef:
@@ -946,62 +622,6 @@
)
)
-;; From gdkregion.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_EVEN_ODD_RULE,
-;; GDK_WINDING_RULE
-;; } GdkFillRule;
-
-(define-enum-extended FillRule
- (in-module "Gdk")
- (c-name "GdkFillRule")
- (values
- '("even-odd-rule" "GDK_EVEN_ODD_RULE" "0")
- '("winding-rule" "GDK_WINDING_RULE" "1")
- )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_OVERLAP_RECTANGLE_IN,
-;; GDK_OVERLAP_RECTANGLE_OUT,
-;; GDK_OVERLAP_RECTANGLE_PART
-;; } GdkOverlapType;
-
-(define-enum-extended OverlapType
- (in-module "Gdk")
- (c-name "GdkOverlapType")
- (values
- '("in" "GDK_OVERLAP_RECTANGLE_IN" "0")
- '("out" "GDK_OVERLAP_RECTANGLE_OUT" "1")
- '("part" "GDK_OVERLAP_RECTANGLE_PART" "2")
- )
-)
-
-;; From gdkrgb.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; GDK_RGB_DITHER_NONE,
-;; GDK_RGB_DITHER_NORMAL,
-;; GDK_RGB_DITHER_MAX
-;; } GdkRgbDither;
-
-(define-enum-extended RgbDither
- (in-module "Gdk")
- (c-name "GdkRgbDither")
- (values
- '("none" "GDK_RGB_DITHER_NONE" "0")
- '("normal" "GDK_RGB_DITHER_NORMAL" "1")
- '("max" "GDK_RGB_DITHER_MAX" "2")
- )
-)
-
;; From gdktypes.h
;; Original typedef:
@@ -1024,19 +644,33 @@
;; typedef enum
;; {
;; GDK_SHIFT_MASK = 1 << 0,
-;; GDK_LOCK_MASK = 1 << 1,
+;; GDK_LOCK_MASK = 1 << 1,
;; GDK_CONTROL_MASK = 1 << 2,
-;; GDK_MOD1_MASK = 1 << 3,
-;; GDK_MOD2_MASK = 1 << 4,
-;; GDK_MOD3_MASK = 1 << 5,
-;; GDK_MOD4_MASK = 1 << 6,
-;; GDK_MOD5_MASK = 1 << 7,
+;; GDK_MOD1_MASK = 1 << 3,
+;; GDK_MOD2_MASK = 1 << 4,
+;; GDK_MOD3_MASK = 1 << 5,
+;; GDK_MOD4_MASK = 1 << 6,
+;; GDK_MOD5_MASK = 1 << 7,
;; GDK_BUTTON1_MASK = 1 << 8,
;; GDK_BUTTON2_MASK = 1 << 9,
;; GDK_BUTTON3_MASK = 1 << 10,
;; GDK_BUTTON4_MASK = 1 << 11,
;; GDK_BUTTON5_MASK = 1 << 12,
;;
+;; GDK_MODIFIER_RESERVED_13_MASK = 1 << 13,
+;; GDK_MODIFIER_RESERVED_14_MASK = 1 << 14,
+;; GDK_MODIFIER_RESERVED_15_MASK = 1 << 15,
+;; GDK_MODIFIER_RESERVED_16_MASK = 1 << 16,
+;; GDK_MODIFIER_RESERVED_17_MASK = 1 << 17,
+;; GDK_MODIFIER_RESERVED_18_MASK = 1 << 18,
+;; GDK_MODIFIER_RESERVED_19_MASK = 1 << 19,
+;; GDK_MODIFIER_RESERVED_20_MASK = 1 << 20,
+;; GDK_MODIFIER_RESERVED_21_MASK = 1 << 21,
+;; GDK_MODIFIER_RESERVED_22_MASK = 1 << 22,
+;; GDK_MODIFIER_RESERVED_23_MASK = 1 << 23,
+;; GDK_MODIFIER_RESERVED_24_MASK = 1 << 24,
+;; GDK_MODIFIER_RESERVED_25_MASK = 1 << 25,
+;;
;; /* The next few modifiers are used by XKB, so we skip to the end.
;; * Bits 15 - 25 are currently unused. Bit 29 is used internally.
;; */
@@ -1045,8 +679,12 @@
;; GDK_HYPER_MASK = 1 << 27,
;; GDK_META_MASK = 1 << 28,
;;
+;; GDK_MODIFIER_RESERVED_29_MASK = 1 << 29,
+;;
;; GDK_RELEASE_MASK = 1 << 30,
;;
+;; /* Combination of GDK_SHIFT_MASK..GDK_BUTTON5_MASK + GDK_SUPER_MASK
+;; + GDK_HYPER_MASK + GDK_META_MASK + GDK_RELEASE_MASK */
;; GDK_MODIFIER_MASK = 0x5c001fff
;; } GdkModifierType;
@@ -1067,9 +705,23 @@
'("button3-mask" "GDK_BUTTON3_MASK" "1 << 10")
'("button4-mask" "GDK_BUTTON4_MASK" "1 << 11")
'("button5-mask" "GDK_BUTTON5_MASK" "1 << 12")
+ '("modifier-reserved-13-mask" "GDK_MODIFIER_RESERVED_13_MASK" "1 << 13")
+ '("modifier-reserved-14-mask" "GDK_MODIFIER_RESERVED_14_MASK" "1 << 14")
+ '("modifier-reserved-15-mask" "GDK_MODIFIER_RESERVED_15_MASK" "1 << 15")
+ '("modifier-reserved-16-mask" "GDK_MODIFIER_RESERVED_16_MASK" "1 << 16")
+ '("modifier-reserved-17-mask" "GDK_MODIFIER_RESERVED_17_MASK" "1 << 17")
+ '("modifier-reserved-18-mask" "GDK_MODIFIER_RESERVED_18_MASK" "1 << 18")
+ '("modifier-reserved-19-mask" "GDK_MODIFIER_RESERVED_19_MASK" "1 << 19")
+ '("modifier-reserved-20-mask" "GDK_MODIFIER_RESERVED_20_MASK" "1 << 20")
+ '("modifier-reserved-21-mask" "GDK_MODIFIER_RESERVED_21_MASK" "1 << 21")
+ '("modifier-reserved-22-mask" "GDK_MODIFIER_RESERVED_22_MASK" "1 << 22")
+ '("modifier-reserved-23-mask" "GDK_MODIFIER_RESERVED_23_MASK" "1 << 23")
+ '("modifier-reserved-24-mask" "GDK_MODIFIER_RESERVED_24_MASK" "1 << 24")
+ '("modifier-reserved-25-mask" "GDK_MODIFIER_RESERVED_25_MASK" "1 << 25")
'("super-mask" "GDK_SUPER_MASK" "1 << 26")
'("hyper-mask" "GDK_HYPER_MASK" "1 << 27")
'("meta-mask" "GDK_META_MASK" "1 << 28")
+ '("modifier-reserved-29-mask" "GDK_MODIFIER_RESERVED_29_MASK" "1 << 29")
'("release-mask" "GDK_RELEASE_MASK" "1 << 30")
'("modifier-mask" "GDK_MODIFIER_MASK" "0x5c001fff")
)
@@ -1078,11 +730,11 @@
;; Original typedef:
;; typedef enum
;; {
-;; GDK_OK = 0,
-;; GDK_ERROR = -1,
+;; GDK_OK = 0,
+;; GDK_ERROR = -1,
;; GDK_ERROR_PARAM = -2,
;; GDK_ERROR_FILE = -3,
-;; GDK_ERROR_MEM = -4
+;; GDK_ERROR_MEM = -4
;; } GdkStatus;
(define-enum-extended Status
@@ -1226,11 +878,11 @@
;; {
;; GDK_INPUT_OUTPUT,
;; GDK_INPUT_ONLY
-;; } GdkWindowClass;
+;; } GdkWindowWindowClass;
-(define-enum-extended WindowClass
+(define-enum-extended WindowWindowClass
(in-module "Gdk")
- (c-name "GdkWindowClass")
+ (c-name "GdkWindowWindowClass")
(values
'("output" "GDK_INPUT_OUTPUT" "0")
'("only" "GDK_INPUT_ONLY" "1")
@@ -1243,7 +895,6 @@
;; GDK_WINDOW_ROOT,
;; GDK_WINDOW_TOPLEVEL,
;; GDK_WINDOW_CHILD,
-;; GDK_WINDOW_DIALOG,
;; GDK_WINDOW_TEMP,
;; GDK_WINDOW_FOREIGN,
;; GDK_WINDOW_OFFSCREEN
@@ -1256,10 +907,9 @@
'("root" "GDK_WINDOW_ROOT" "0")
'("toplevel" "GDK_WINDOW_TOPLEVEL" "1")
'("child" "GDK_WINDOW_CHILD" "2")
- '("dialog" "GDK_WINDOW_DIALOG" "3")
- '("temp" "GDK_WINDOW_TEMP" "4")
- '("foreign" "GDK_WINDOW_FOREIGN" "5")
- '("offscreen" "GDK_WINDOW_OFFSCREEN" "6")
+ '("temp" "GDK_WINDOW_TEMP" "3")
+ '("foreign" "GDK_WINDOW_FOREIGN" "4")
+ '("offscreen" "GDK_WINDOW_OFFSCREEN" "5")
)
)
@@ -1270,11 +920,10 @@
;; GDK_WA_X = 1 << 2,
;; GDK_WA_Y = 1 << 3,
;; GDK_WA_CURSOR = 1 << 4,
-;; GDK_WA_COLORMAP = 1 << 5,
-;; GDK_WA_VISUAL = 1 << 6,
-;; GDK_WA_WMCLASS = 1 << 7,
-;; GDK_WA_NOREDIR = 1 << 8,
-;; GDK_WA_TYPE_HINT = 1 << 9
+;; GDK_WA_VISUAL = 1 << 5,
+;; GDK_WA_WMCLASS = 1 << 6,
+;; GDK_WA_NOREDIR = 1 << 7,
+;; GDK_WA_TYPE_HINT = 1 << 8
;; } GdkWindowAttributesType;
(define-flags-extended WindowAttributesType
@@ -1285,11 +934,10 @@
'("x" "GDK_WA_X" "1 << 2")
'("y" "GDK_WA_Y" "1 << 3")
'("cursor" "GDK_WA_CURSOR" "1 << 4")
- '("colormap" "GDK_WA_COLORMAP" "1 << 5")
- '("visual" "GDK_WA_VISUAL" "1 << 6")
- '("wmclass" "GDK_WA_WMCLASS" "1 << 7")
- '("noredir" "GDK_WA_NOREDIR" "1 << 8")
- '("type-hint" "GDK_WA_TYPE_HINT" "1 << 9")
+ '("visual" "GDK_WA_VISUAL" "1 << 5")
+ '("wmclass" "GDK_WA_WMCLASS" "1 << 6")
+ '("noredir" "GDK_WA_NOREDIR" "1 << 7")
+ '("type-hint" "GDK_WA_TYPE_HINT" "1 << 8")
)
)
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index adc20e0..1766a9e 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -222,6 +222,36 @@
)
)
+;; From gtkcsssection.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;; GTK_CSS_SECTION_DOCUMENT,
+;; GTK_CSS_SECTION_IMPORT,
+;; GTK_CSS_SECTION_COLOR_DEFINITION,
+;; GTK_CSS_SECTION_BINDING_SET,
+;; GTK_CSS_SECTION_RULESET,
+;; GTK_CSS_SECTION_SELECTOR,
+;; GTK_CSS_SECTION_DECLARATION,
+;; GTK_CSS_SECTION_VALUE
+;; } GtkCssSectionType;
+
+(define-enum-extended CssSectionType
+ (in-module "Gtk")
+ (c-name "GtkCssSectionType")
+ (values
+ '("document" "GTK_CSS_SECTION_DOCUMENT" "0")
+ '("import" "GTK_CSS_SECTION_IMPORT" "1")
+ '("color-definition" "GTK_CSS_SECTION_COLOR_DEFINITION" "2")
+ '("binding-set" "GTK_CSS_SECTION_BINDING_SET" "3")
+ '("ruleset" "GTK_CSS_SECTION_RULESET" "4")
+ '("selector" "GTK_CSS_SECTION_SELECTOR" "5")
+ '("declaration" "GTK_CSS_SECTION_DECLARATION" "6")
+ '("value" "GTK_CSS_SECTION_VALUE" "7")
+ )
+)
+
;; From gtkdebug.h
;; Original typedef:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
