]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkenums.h
gtkenums.h: Remove trailing comma to fix warning.
[~andy/gtk] / gtk / gtkenums.h
index eaf5b8674d29a202ba5bc931b9a49c4d1f26f3f4..0cde3269169b0a3c31da42c070199b6e0380f38c 100644 (file)
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * 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
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ENUMS_H__
 #define __GTK_ENUMS_H__
 
-#include <glib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+#include <glib-object.h>
 
+G_BEGIN_DECLS
 
+/* Anchor types */
 typedef enum
 {
-  /* should the accelerator appear in
-   * the widget's display?
-   */
-  G_NV (GTK_ACCEL_VISIBLE,             visible,        1 << 0),
-  /* should the signal associated with
-   * this accelerator be also visible?
-   */
-  G_NV (GTK_ACCEL_SIGNAL_VISIBLE,      signal-visible, 1 << 1),
-  /* may the accelerator be removed
-   * again?
-   */
-  G_NV (GTK_ACCEL_LOCKED,              locked,         1 << 2),
-  G_NV (GTK_ACCEL_MASK,                        mask,           0x07)
-} G_FLAGS (GtkAccelFlags);
-
+  GTK_ANCHOR_CENTER,
+  GTK_ANCHOR_NORTH,
+  GTK_ANCHOR_NORTH_WEST,
+  GTK_ANCHOR_NORTH_EAST,
+  GTK_ANCHOR_SOUTH,
+  GTK_ANCHOR_SOUTH_WEST,
+  GTK_ANCHOR_SOUTH_EAST,
+  GTK_ANCHOR_WEST,
+  GTK_ANCHOR_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
+} GtkAnchorType;
+
+/* Arrow placement */
+typedef enum
+{
+  GTK_ARROWS_BOTH,
+  GTK_ARROWS_START,
+  GTK_ARROWS_END
+} GtkArrowPlacement;
 
 /* Arrow types */
 typedef enum
 {
-  G_SV (GTK_ARROW_UP,   up),
-  G_SV (GTK_ARROW_DOWN,         down),
-  G_SV (GTK_ARROW_LEFT,         left),
-  G_SV (GTK_ARROW_RIGHT, right),
-} G_ENUM (GtkArrowType);
+  GTK_ARROW_UP,
+  GTK_ARROW_DOWN,
+  GTK_ARROW_LEFT,
+  GTK_ARROW_RIGHT,
+  GTK_ARROW_NONE
+} GtkArrowType;
 
 /* Attach options (for tables) */
 typedef enum
 {
-  G_NV (GTK_EXPAND,    expand, 1 << 0),
-  G_NV (GTK_SHRINK,    shrink, 1 << 1),
-  G_NV (GTK_FILL,      fill,   1 << 2)
-} G_FLAGS (GtkAttachOptions);
+  GTK_EXPAND = 1 << 0,
+  GTK_SHRINK = 1 << 1,
+  GTK_FILL   = 1 << 2
+} GtkAttachOptions;
 
-/* button box styles */
+/* Button box styles */
 typedef enum
 {
-  G_SV (GTK_BUTTONBOX_DEFAULT_STYLE,   default),
-  G_SV (GTK_BUTTONBOX_SPREAD,          spread),
-  G_SV (GTK_BUTTONBOX_EDGE,            edge),
-  G_SV (GTK_BUTTONBOX_START,           start),
-  G_SV (GTK_BUTTONBOX_END,             end),
-} G_ENUM (GtkButtonBoxStyle);
+  GTK_BUTTONBOX_DEFAULT_STYLE,
+  GTK_BUTTONBOX_SPREAD,
+  GTK_BUTTONBOX_EDGE,
+  GTK_BUTTONBOX_START,
+  GTK_BUTTONBOX_END,
+  GTK_BUTTONBOX_CENTER
+} GtkButtonBoxStyle;
 
-/* curve types */
 typedef enum
 {
-  G_SV (GTK_CURVE_TYPE_LINEAR, linear)        /* linear interpolation */,
-  G_SV (GTK_CURVE_TYPE_SPLINE, spline)        /* spline interpolation */,
-  G_SV (GTK_CURVE_TYPE_FREE,   free)          /* free form curve */
-} G_ENUM (GtkCurveType);
+  GTK_DELETE_CHARS,
+  GTK_DELETE_WORD_ENDS,           /* delete only the portion of the word to the
+                                   * left/right of cursor if we're in the middle
+                                   * of a word */
+  GTK_DELETE_WORDS,
+  GTK_DELETE_DISPLAY_LINES,
+  GTK_DELETE_DISPLAY_LINE_ENDS,
+  GTK_DELETE_PARAGRAPH_ENDS,      /* like C-k in Emacs (or its reverse) */
+  GTK_DELETE_PARAGRAPHS,          /* C-k in pico, kill whole line */
+  GTK_DELETE_WHITESPACE           /* M-\ in Emacs */
+} GtkDeleteType;
 
 /* Focus movement types */
 typedef enum
 {
-  G_SV (GTK_DIR_TAB_FORWARD,   tab-forward),
-  G_SV (GTK_DIR_TAB_BACKWARD,  tab-backward),
-  G_SV (GTK_DIR_UP,            up),
-  G_SV (GTK_DIR_DOWN,          down),
-  G_SV (GTK_DIR_LEFT,          left),
-  G_SV (GTK_DIR_RIGHT,         right)
-} G_ENUM (GtkDirectionType);
+  GTK_DIR_TAB_FORWARD,
+  GTK_DIR_TAB_BACKWARD,
+  GTK_DIR_UP,
+  GTK_DIR_DOWN,
+  GTK_DIR_LEFT,
+  GTK_DIR_RIGHT
+} GtkDirectionType;
+
+/* Expander styles */
+typedef enum
+{
+  GTK_EXPANDER_COLLAPSED,
+  GTK_EXPANDER_SEMI_COLLAPSED,
+  GTK_EXPANDER_SEMI_EXPANDED,
+  GTK_EXPANDER_EXPANDED
+} GtkExpanderStyle;
+
+/* Built-in stock icon sizes */
+typedef enum
+{
+  GTK_ICON_SIZE_INVALID,
+  GTK_ICON_SIZE_MENU,
+  GTK_ICON_SIZE_SMALL_TOOLBAR,
+  GTK_ICON_SIZE_LARGE_TOOLBAR,
+  GTK_ICON_SIZE_BUTTON,
+  GTK_ICON_SIZE_DND,
+  GTK_ICON_SIZE_DIALOG
+} GtkIconSize;
+
+/**
+ * GtkSensitivityType:
+ * @GTK_SENSITIVITY_AUTO: The arrow is made insensitive if the
+ *   thumb is at the end
+ * @GTK_SENSITIVITY_ON: The arrow is always sensitive
+ * @GTK_SENSITIVITY_OFF: The arrow is always insensitive
+ *
+ * Determines how GTK+ handles the sensitivity of stepper arrows
+ * at the end of range widgets.
+ */
+typedef enum
+{
+  GTK_SENSITIVITY_AUTO,
+  GTK_SENSITIVITY_ON,
+  GTK_SENSITIVITY_OFF
+} GtkSensitivityType;
+
+/* Reading directions for text */
+typedef enum
+{
+  GTK_TEXT_DIR_NONE,
+  GTK_TEXT_DIR_LTR,
+  GTK_TEXT_DIR_RTL
+} GtkTextDirection;
 
 /* justification for label and maybe other widgets (text?) */
 typedef enum
 {
-  G_SV (GTK_JUSTIFY_LEFT,      left),
-  G_SV (GTK_JUSTIFY_RIGHT,     right),
-  G_SV (GTK_JUSTIFY_CENTER,    center),
-  G_SV (GTK_JUSTIFY_FILL,      fill),
-} G_ENUM (GtkJustification);
+  GTK_JUSTIFY_LEFT,
+  GTK_JUSTIFY_RIGHT,
+  GTK_JUSTIFY_CENTER,
+  GTK_JUSTIFY_FILL
+} GtkJustification;
 
-/* GtkPatternSpec match types */
+/* Menu keyboard movement types */
 typedef enum
 {
-  G_SV (GTK_MATCH_ALL,         all)         /* "*A?A*" */,
-  G_SV (GTK_MATCH_ALL_TAIL,    all-tail)    /* "*A?AA" */,
-  G_SV (GTK_MATCH_HEAD,                head)        /* "AAAA*" */,
-  G_SV (GTK_MATCH_TAIL,                tail)        /* "*AAAA" */,
-  G_SV (GTK_MATCH_EXACT,       exact)       /* "AAAAA" */,
-  G_SV (GTK_MATCH_LAST,                last)
-} G_ENUM (GtkMatchType);
+  GTK_MENU_DIR_PARENT,
+  GTK_MENU_DIR_CHILD,
+  GTK_MENU_DIR_NEXT,
+  GTK_MENU_DIR_PREV
+} GtkMenuDirectionType;
+
+/**
+ * GtkMessageType:
+ * @GTK_MESSAGE_INFO: Informational message
+ * @GTK_MESSAGE_WARNING: Nonfatal warning message
+ * @GTK_MESSAGE_QUESTION: Question requiring a choice
+ * @GTK_MESSAGE_ERROR: Fatal error message
+ * @GTK_MESSAGE_OTHER: None of the above, doesn't get an icon
+ *
+ * The type of message being displayed in the dialog.
+ */
+typedef enum
+{
+  GTK_MESSAGE_INFO,
+  GTK_MESSAGE_WARNING,
+  GTK_MESSAGE_QUESTION,
+  GTK_MESSAGE_ERROR,
+  GTK_MESSAGE_OTHER
+} GtkMessageType;
 
-/* menu factory types (outdated) */
 typedef enum
 {
-  G_SV (GTK_MENU_FACTORY_MENU,         menu),
-  G_SV (GTK_MENU_FACTORY_MENU_BAR,     menu-bar),
-  G_SV (GTK_MENU_FACTORY_OPTION_MENU,  option-menu)
-} G_ENUM (GtkMenuFactoryType);
+  GTK_PIXELS,
+  GTK_INCHES,
+  GTK_CENTIMETERS
+} GtkMetricType;
+
+/**
+ * GtkMovementStep:
+ * @GTK_MOVEMENT_LOGICAL_POSITIONS: Move forward or back by graphemes
+ * @GTK_MOVEMENT_VISUAL_POSITIONS:  Move left or right by graphemes
+ * @GTK_MOVEMENT_WORDS:             Move forward or back by words
+ * @GTK_MOVEMENT_DISPLAY_LINES:     Move up or down lines (wrapped lines)
+ * @GTK_MOVEMENT_DISPLAY_LINE_ENDS: Move to either end of a line
+ * @GTK_MOVEMENT_PARAGRAPHS:        Move up or down paragraphs (newline-ended lines)
+ * @GTK_MOVEMENT_PARAGRAPH_ENDS:    Move to either end of a paragraph
+ * @GTK_MOVEMENT_PAGES:             Move by pages
+ * @GTK_MOVEMENT_BUFFER_ENDS:       Move to ends of the buffer
+ * @GTK_MOVEMENT_HORIZONTAL_PAGES:  Move horizontally by pages
+ */
+typedef enum
+{
+  GTK_MOVEMENT_LOGICAL_POSITIONS,
+  GTK_MOVEMENT_VISUAL_POSITIONS,
+  GTK_MOVEMENT_WORDS,
+  GTK_MOVEMENT_DISPLAY_LINES,
+  GTK_MOVEMENT_DISPLAY_LINE_ENDS,
+  GTK_MOVEMENT_PARAGRAPHS,
+  GTK_MOVEMENT_PARAGRAPH_ENDS,
+  GTK_MOVEMENT_PAGES,
+  GTK_MOVEMENT_BUFFER_ENDS,
+  GTK_MOVEMENT_HORIZONTAL_PAGES
+} GtkMovementStep;
 
-/* gtk metrics */
 typedef enum
 {
-  G_SV (GTK_PIXELS,            pixels),
-  G_SV (GTK_INCHES,            inches),
-  G_SV (GTK_CENTIMETERS,       centimeters)
-} G_ENUM (GtkMetricType);
+  GTK_SCROLL_STEPS,
+  GTK_SCROLL_PAGES,
+  GTK_SCROLL_ENDS,
+  GTK_SCROLL_HORIZONTAL_STEPS,
+  GTK_SCROLL_HORIZONTAL_PAGES,
+  GTK_SCROLL_HORIZONTAL_ENDS
+} GtkScrollStep;
 
 /* Orientation for toolbars, etc. */
 typedef enum
 {
-  G_SV (GTK_ORIENTATION_HORIZONTAL,    horizontal),
-  G_SV (GTK_ORIENTATION_VERTICAL,      vertical)
-} G_ENUM (GtkOrientation);
+  GTK_ORIENTATION_HORIZONTAL,
+  GTK_ORIENTATION_VERTICAL
+} GtkOrientation;
+
+/* Placement type for scrolled window */
+typedef enum
+{
+  GTK_CORNER_TOP_LEFT,
+  GTK_CORNER_BOTTOM_LEFT,
+  GTK_CORNER_TOP_RIGHT,
+  GTK_CORNER_BOTTOM_RIGHT
+} GtkCornerType;
 
 /* Packing types (for boxes) */
 typedef enum
 {
-  G_SV (GTK_PACK_START,                start),
-  G_SV (GTK_PACK_END,          end)
-} G_ENUM (GtkPackType);
+  GTK_PACK_START,
+  GTK_PACK_END
+} GtkPackType;
 
 /* priorities for path lookups */
 typedef enum
 {
-  G_NV (GTK_PATH_PRIO_LOWEST,          lowest,         0),
-  G_NV (GTK_PATH_PRIO_GTK,             gtk,            4),
-  G_NV (GTK_PATH_PRIO_APPLICATION,     application,    8),
-  G_NV (GTK_PATH_PRIO_RC,              rc,             12),
-  G_NV (GTK_PATH_PRIO_HIGHEST,         highest,        15),
-  G_NV (GTK_PATH_PRIO_MASK,            mask,           0x0f)
-} G_ENUM (GtkPathPriorityType);
+  GTK_PATH_PRIO_LOWEST      = 0,
+  GTK_PATH_PRIO_GTK        = 4,
+  GTK_PATH_PRIO_APPLICATION = 8,
+  GTK_PATH_PRIO_THEME       = 10,
+  GTK_PATH_PRIO_RC          = 12,
+  GTK_PATH_PRIO_HIGHEST     = 15
+} GtkPathPriorityType;
+#define GTK_PATH_PRIO_MASK 0x0f
 
 /* widget path types */
 typedef enum
 {
-  G_SV (GTK_PATH_WIDGET,       widget),
-  G_SV (GTK_PATH_WIDGET_CLASS, widget-class),
-  G_SV (GTK_PATH_CLASS,                class)
-} G_ENUM (GtkPathType);
+  GTK_PATH_WIDGET,
+  GTK_PATH_WIDGET_CLASS,
+  GTK_PATH_CLASS
+} GtkPathType;
 
 /* Scrollbar policy types (for scrolled windows) */
 typedef enum
 {
-  G_SV (GTK_POLICY_ALWAYS,     always),
-  G_SV (GTK_POLICY_AUTOMATIC,  automatic)
-} G_ENUM (GtkPolicyType);
+  GTK_POLICY_ALWAYS,
+  GTK_POLICY_AUTOMATIC,
+  GTK_POLICY_NEVER
+} GtkPolicyType;
 
-/* gtk position */
 typedef enum
 {
-  G_SV (GTK_POS_LEFT,  left),
-  G_SV (GTK_POS_RIGHT, right),
-  G_SV (GTK_POS_TOP,   top),
-  G_SV (GTK_POS_BOTTOM,        bottom)
-} G_ENUM (GtkPositionType);
+  GTK_POS_LEFT,
+  GTK_POS_RIGHT,
+  GTK_POS_TOP,
+  GTK_POS_BOTTOM
+} GtkPositionType;
 
-/* GtkPreview types */
+/* Style for buttons */
 typedef enum
 {
-  G_SV (GTK_PREVIEW_COLOR,     color),
-  G_SV (GTK_PREVIEW_GRAYSCALE, grayscale),
-  G_NV (GTK_PREVIEW_GREYSCALE, greyscale,      GTK_PREVIEW_GRAYSCALE)
-} G_ENUM (GtkPreviewType);
+  GTK_RELIEF_NORMAL,
+  GTK_RELIEF_HALF,
+  GTK_RELIEF_NONE
+} GtkReliefStyle;
 
-/* Style for buttons */
+/* Resize type */
 typedef enum
 {
-  G_SV (GTK_RELIEF_NORMAL,     normal),
-  G_SV (GTK_RELIEF_NONE,       none)
-} G_ENUM (GtkReliefStyle);
+  GTK_RESIZE_PARENT,           /* Pass resize request to the parent */
+  GTK_RESIZE_QUEUE,            /* Queue resizes on this widget */
+  GTK_RESIZE_IMMEDIATE         /* Perform the resizes now */
+} GtkResizeMode;
 
 /* scrolling types */
 typedef enum
 {
-  G_SV (GTK_SCROLL_NONE,               none),
-  G_SV (GTK_SCROLL_STEP_BACKWARD,      step-backward),
-  G_SV (GTK_SCROLL_STEP_FORWARD,       step-forward),
-  G_SV (GTK_SCROLL_PAGE_BACKWARD,      page-backward),
-  G_SV (GTK_SCROLL_PAGE_FORWARD,       page-forward),
-  G_SV (GTK_SCROLL_JUMP,               jump)
-} G_ENUM (GtkScrollType);
+  GTK_SCROLL_NONE,
+  GTK_SCROLL_JUMP,
+  GTK_SCROLL_STEP_BACKWARD,
+  GTK_SCROLL_STEP_FORWARD,
+  GTK_SCROLL_PAGE_BACKWARD,
+  GTK_SCROLL_PAGE_FORWARD,
+  GTK_SCROLL_STEP_UP,
+  GTK_SCROLL_STEP_DOWN,
+  GTK_SCROLL_PAGE_UP,
+  GTK_SCROLL_PAGE_DOWN,
+  GTK_SCROLL_STEP_LEFT,
+  GTK_SCROLL_STEP_RIGHT,
+  GTK_SCROLL_PAGE_LEFT,
+  GTK_SCROLL_PAGE_RIGHT,
+  GTK_SCROLL_START,
+  GTK_SCROLL_END
+} GtkScrollType;
 
 /* list selection modes */
 typedef enum
 {
-  G_SV (GTK_SELECTION_SINGLE,  single),
-  G_SV (GTK_SELECTION_BROWSE,  browse),
-  G_SV (GTK_SELECTION_MULTIPLE,        multiple),
-  G_SV (GTK_SELECTION_EXTENDED,        extended)
-} G_ENUM (GtkSelectionMode);
+  GTK_SELECTION_NONE,                             /* Nothing can be selected */
+  GTK_SELECTION_SINGLE,
+  GTK_SELECTION_BROWSE,
+  GTK_SELECTION_MULTIPLE,
+  GTK_SELECTION_EXTENDED = GTK_SELECTION_MULTIPLE /* Deprecated */
+} GtkSelectionMode;
 
 /* Shadow types */
 typedef enum
 {
-  G_SV (GTK_SHADOW_NONE,       none),
-  G_SV (GTK_SHADOW_IN,         in),
-  G_SV (GTK_SHADOW_OUT,                out),
-  G_SV (GTK_SHADOW_ETCHED_IN,  etched-in),
-  G_SV (GTK_SHADOW_ETCHED_OUT, etched-out)
-} G_ENUM (GtkShadowType);
+  GTK_SHADOW_NONE,
+  GTK_SHADOW_IN,
+  GTK_SHADOW_OUT,
+  GTK_SHADOW_ETCHED_IN,
+  GTK_SHADOW_ETCHED_OUT
+} GtkShadowType;
 
-/* signal run types */
+/* Widget states */
+typedef enum
+{
+  GTK_STATE_NORMAL,
+  GTK_STATE_ACTIVE,
+  GTK_STATE_PRELIGHT,
+  GTK_STATE_SELECTED,
+  GTK_STATE_INSENSITIVE
+} GtkStateType;
+
+#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_MENU_INTERNALS)
+/* Directions for submenus */
 typedef enum
 {
-  G_NV (GTK_RUN_FIRST,         first,          0x1),
-  G_NV (GTK_RUN_LAST,          last,           0x2),
-  G_NV (GTK_RUN_BOTH,          both,           0x3),
-  G_NV (GTK_RUN_MASK,          mask,           0xF),
-  G_NV (GTK_RUN_NO_RECURSE,    no-recurse,     0x10),
-  G_NV (GTK_RUN_ACTION,                action,         0x20)
-} G_FLAGS (GtkSignalRunType);
+  GTK_DIRECTION_LEFT,
+  GTK_DIRECTION_RIGHT
+} GtkSubmenuDirection;
 
-/* Widget states */
+/* Placement of submenus */
 typedef enum
 {
-  G_SV (GTK_STATE_NORMAL,      normal),
-  G_SV (GTK_STATE_ACTIVE,      active),
-  G_SV (GTK_STATE_PRELIGHT,    prelight),
-  G_SV (GTK_STATE_SELECTED,    selected),
-  G_SV (GTK_STATE_INSENSITIVE, insensitive)
-} G_ENUM (GtkStateType);
+  GTK_TOP_BOTTOM,
+  GTK_LEFT_RIGHT
+} GtkSubmenuPlacement;
+#endif /* GTK_DISABLE_DEPRECATED */
 
-/* directions for submenus */
+/* Style for toolbars */
 typedef enum
 {
-  G_SV (GTK_DIRECTION_LEFT,    left),
-  G_SV (GTK_DIRECTION_RIGHT,   right)
-} G_ENUM (GtkSubmenuDirection);
+  GTK_TOOLBAR_ICONS,
+  GTK_TOOLBAR_TEXT,
+  GTK_TOOLBAR_BOTH,
+  GTK_TOOLBAR_BOTH_HORIZ
+} GtkToolbarStyle;
 
-/* placement of submenus */
+/* Data update types (for ranges) */
 typedef enum
 {
-  G_SV (GTK_TOP_BOTTOM,                top-bottom),
-  G_SV (GTK_LEFT_RIGHT,                left-right)
-} G_ENUM (GtkSubmenuPlacement);
+  GTK_UPDATE_CONTINUOUS,
+  GTK_UPDATE_DISCONTINUOUS,
+  GTK_UPDATE_DELAYED
+} GtkUpdateType;
 
-/* Style for toolbars */
+/* Generic visibility flags */
 typedef enum
 {
-  G_SV (GTK_TOOLBAR_ICONS,     icons),
-  G_SV (GTK_TOOLBAR_TEXT,      text),
-  G_SV (GTK_TOOLBAR_BOTH,      both)
-} G_ENUM (GtkToolbarStyle);
+  GTK_VISIBILITY_NONE,
+  GTK_VISIBILITY_PARTIAL,
+  GTK_VISIBILITY_FULL
+} GtkVisibility;
 
-/* trough types for GtkRange */
+/* Window position types */
 typedef enum
 {
-  G_SV (GTK_TROUGH_NONE,       none),
-  G_SV (GTK_TROUGH_START,      start),
-  G_SV (GTK_TROUGH_END,                end),
-  G_SV (GTK_TROUGH_JUMP,       jump)
-} G_ENUM (GtkTroughType);
+  GTK_WIN_POS_NONE,
+  GTK_WIN_POS_CENTER,
+  GTK_WIN_POS_MOUSE,
+  GTK_WIN_POS_CENTER_ALWAYS,
+  GTK_WIN_POS_CENTER_ON_PARENT
+} GtkWindowPosition;
 
-/* Data update types (for ranges) */
+/* Window types */
 typedef enum
 {
-  G_SV (GTK_UPDATE_CONTINUOUS,         continuous),
-  G_SV (GTK_UPDATE_DISCONTINUOUS,      discontinuous),
-  G_SV (GTK_UPDATE_DELAYED,            delayed)
-} G_ENUM (GtkUpdateType);
+  GTK_WINDOW_TOPLEVEL,
+  GTK_WINDOW_POPUP
+} GtkWindowType;
 
-/* Generic visibility flags */
+/* Text wrap */
 typedef enum
 {
-  G_SV (GTK_VISIBILITY_NONE,           none),
-  G_SV (GTK_VISIBILITY_PARTIAL,                partial),
-  G_SV (GTK_VISIBILITY_FULL,           full)
-} G_ENUM (GtkVisibility);
+  GTK_WRAP_NONE,
+  GTK_WRAP_CHAR,
+  GTK_WRAP_WORD,
+  GTK_WRAP_WORD_CHAR
+} GtkWrapMode;
 
-/* window position types */
+/* How to sort */
 typedef enum
 {
-  G_SV (GTK_WIN_POS_NONE,      none),
-  G_SV (GTK_WIN_POS_CENTER,    center),
-  G_SV (GTK_WIN_POS_MOUSE,     mouse)
-} G_ENUM (GtkWindowPosition);
+  GTK_SORT_ASCENDING,
+  GTK_SORT_DESCENDING
+} GtkSortType;
+
+/* Style for gtk input method preedit/status */
+typedef enum
+{
+  GTK_IM_PREEDIT_NOTHING,
+  GTK_IM_PREEDIT_CALLBACK,
+  GTK_IM_PREEDIT_NONE
+} GtkIMPreeditStyle;
+
+typedef enum
+{
+  GTK_IM_STATUS_NOTHING,
+  GTK_IM_STATUS_CALLBACK,
+  GTK_IM_STATUS_NONE
+} GtkIMStatusStyle;
 
-/* Window types */
 typedef enum
 {
-  G_SV (GTK_WINDOW_TOPLEVEL,   toplevel),
-  G_SV (GTK_WINDOW_DIALOG,     dialog),
-  G_SV (GTK_WINDOW_POPUP,      popup)
-} G_ENUM (GtkWindowType);
+  GTK_PACK_DIRECTION_LTR,
+  GTK_PACK_DIRECTION_RTL,
+  GTK_PACK_DIRECTION_TTB,
+  GTK_PACK_DIRECTION_BTT
+} GtkPackDirection;
 
+typedef enum
+{
+  GTK_PRINT_PAGES_ALL,
+  GTK_PRINT_PAGES_CURRENT,
+  GTK_PRINT_PAGES_RANGES,
+  GTK_PRINT_PAGES_SELECTION
+} GtkPrintPages;
+
+typedef enum
+{
+  GTK_PAGE_SET_ALL,
+  GTK_PAGE_SET_EVEN,
+  GTK_PAGE_SET_ODD
+} GtkPageSet;
 
+typedef enum
+{
+  GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM, /*< nick=lrtb >*/
+  GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP, /*< nick=lrbt >*/
+  GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM, /*< nick=rltb >*/
+  GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP, /*< nick=rlbt >*/
+  GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT, /*< nick=tblr >*/
+  GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT, /*< nick=tbrl >*/
+  GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT, /*< nick=btlr >*/
+  GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT  /*< nick=btrl >*/
+} GtkNumberUpLayout;
+
+typedef enum
+{
+  GTK_PAGE_ORIENTATION_PORTRAIT,
+  GTK_PAGE_ORIENTATION_LANDSCAPE,
+  GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT,
+  GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE
+} GtkPageOrientation;
+
+typedef enum
+{
+  GTK_PRINT_QUALITY_LOW,
+  GTK_PRINT_QUALITY_NORMAL,
+  GTK_PRINT_QUALITY_HIGH,
+  GTK_PRINT_QUALITY_DRAFT
+} GtkPrintQuality;
+
+typedef enum
+{
+  GTK_PRINT_DUPLEX_SIMPLEX,
+  GTK_PRINT_DUPLEX_HORIZONTAL,
+  GTK_PRINT_DUPLEX_VERTICAL
+} GtkPrintDuplex;
+
+
+typedef enum
+{
+  GTK_UNIT_PIXEL,
+  GTK_UNIT_POINTS,
+  GTK_UNIT_INCH,
+  GTK_UNIT_MM
+} GtkUnit;
+
+typedef enum
+{
+  GTK_TREE_VIEW_GRID_LINES_NONE,
+  GTK_TREE_VIEW_GRID_LINES_HORIZONTAL,
+  GTK_TREE_VIEW_GRID_LINES_VERTICAL,
+  GTK_TREE_VIEW_GRID_LINES_BOTH
+} GtkTreeViewGridLines;
+
+typedef enum
+{
+  GTK_DRAG_RESULT_SUCCESS,
+  GTK_DRAG_RESULT_NO_TARGET,
+  GTK_DRAG_RESULT_USER_CANCELLED,
+  GTK_DRAG_RESULT_TIMEOUT_EXPIRED,
+  GTK_DRAG_RESULT_GRAB_BROKEN,
+  GTK_DRAG_RESULT_ERROR
+} GtkDragResult;
+
+/**
+ * GtkSizeRequestMode:
+ * @GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH: Prefer height-for-width geometry management
+ * @GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT: Prefer width-for-height geometry management
+ * 
+ * Specifies a preference for height-for-width or
+ * width-for-height geometry management.
+ */
+typedef enum
+{
+  GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH = 0,
+  GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT
+} GtkSizeRequestMode;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __GTK_ENUMS_H__ */