New static function to set the background of all windows.

[~andy/gtk] / gtk / gtkenums.h

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 12ae775ee200e049a142bb0f1f446903e40d8799..9eafc1741235f69442bea2a283dcf31a752b5f3d 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -136,6 +136,7 @@ typedef enum
   GTK_ICON_SIZE_DIALOG
 } GtkIconSize;
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* side types */
 typedef enum
 {
@@ -144,6 +145,7 @@ typedef enum
   GTK_SIDE_LEFT,
   GTK_SIDE_RIGHT
 } GtkSideType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Reading directions for text */
 typedef enum
@@ -162,6 +164,7 @@ typedef enum
   GTK_JUSTIFY_FILL
 } GtkJustification;
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* GtkPatternSpec match types */
 typedef enum
 {
@@ -172,6 +175,7 @@ typedef enum
   GTK_MATCH_EXACT,     /* "AAAAA" */
   GTK_MATCH_LAST
 } GtkMatchType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Menu keyboard movement types */
 typedef enum
@@ -260,11 +264,13 @@ typedef enum
   GTK_POS_BOTTOM
 } GtkPositionType;
 
+#ifndef GTK_DISABLE_DEPRECATED
 typedef enum
 {
   GTK_PREVIEW_COLOR,
   GTK_PREVIEW_GRAYSCALE
 } GtkPreviewType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Style for buttons */
 typedef enum
@@ -282,6 +288,7 @@ typedef enum
   GTK_RESIZE_IMMEDIATE         /* Perform the resizes now */
 } GtkResizeMode;
 
+#ifndef GTK_DISABLE_DEPRECATED
 /* signal run types */
 typedef enum                   /*< flags >*/
 {
@@ -292,6 +299,7 @@ typedef enum                        /*< flags >*/
   GTK_RUN_ACTION     = G_SIGNAL_ACTION,
   GTK_RUN_NO_HOOKS   = G_SIGNAL_NO_HOOKS
 } GtkSignalRunType;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* scrolling types */
 typedef enum
@@ -344,6 +352,7 @@ typedef enum
   GTK_STATE_INSENSITIVE
 } GtkStateType;
 
+#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_MENU_INTERNALS)
 /* Directions for submenus */
 typedef enum
 {
@@ -357,6 +366,7 @@ typedef enum
   GTK_TOP_BOTTOM,
   GTK_LEFT_RIGHT
 } GtkSubmenuPlacement;
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Style for toolbars */
 typedef enum
@@ -415,6 +425,19 @@ typedef enum
   GTK_SORT_DESCENDING
 } GtkSortType;
 
+/* Style for gtk input method preedit/status */
+typedef enum
+{
+  GTK_IM_PREEDIT_NOTHING,
+  GTK_IM_PREEDIT_CALLBACK
+} GtkIMPreeditStyle;
+
+typedef enum
+{
+  GTK_IM_STATUS_NOTHING,
+  GTK_IM_STATUS_CALLBACK
+} GtkIMStatusStyle;
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */