[gtk+] css: Move enum



commit 75d7f7e756fa129e6ccb8e8df6b35b1acfec554f
Author: Benjamin Otte <otte redhat com>
Date:   Tue Dec 15 14:52:17 2015 +0100

    css: Move enum
    
    I want to use it for a gadget, so it's better in the generic file.

 gtk/gtkcssimagebuiltinprivate.h |   33 ---------------------------------
 gtk/gtkcsstypesprivate.h        |   33 +++++++++++++++++++++++++++++++++
 gtk/gtkrendericon.c             |    1 +
 gtk/gtkrendericonprivate.h      |    1 -
 4 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/gtk/gtkcssimagebuiltinprivate.h b/gtk/gtkcssimagebuiltinprivate.h
index 8bbdf4d..9ed8a54 100644
--- a/gtk/gtkcssimagebuiltinprivate.h
+++ b/gtk/gtkcssimagebuiltinprivate.h
@@ -25,39 +25,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-  GTK_CSS_IMAGE_BUILTIN_NONE,
-  GTK_CSS_IMAGE_BUILTIN_CHECK,
-  GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
-  GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
-  GTK_CSS_IMAGE_BUILTIN_OPTION,
-  GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
-  GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_UP,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPLEFT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOP,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPRIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMRIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOM,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMLEFT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR,
-  GTK_CSS_IMAGE_BUILTIN_HANDLE,
-  GTK_CSS_IMAGE_BUILTIN_SPINNER
-} GtkCssImageBuiltinType;
-
 #define GTK_TYPE_CSS_IMAGE_BUILTIN           (gtk_css_image_builtin_get_type ())
 #define GTK_CSS_IMAGE_BUILTIN(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_IMAGE_BUILTIN, 
GtkCssImageBuiltin))
 #define GTK_CSS_IMAGE_BUILTIN_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_IMAGE_BUILTIN, 
GtkCssImageBuiltinClass))
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 1896bfe..1660db8 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -227,6 +227,39 @@ enum { /*< skip >*/
 };
 
 typedef enum /*< skip >*/ {
+  GTK_CSS_IMAGE_BUILTIN_NONE,
+  GTK_CSS_IMAGE_BUILTIN_CHECK,
+  GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
+  GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
+  GTK_CSS_IMAGE_BUILTIN_OPTION,
+  GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
+  GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_UP,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPLEFT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOP,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPRIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMRIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOM,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMLEFT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR,
+  GTK_CSS_IMAGE_BUILTIN_HANDLE,
+  GTK_CSS_IMAGE_BUILTIN_SPINNER
+} GtkCssImageBuiltinType;
+
+typedef enum /*< skip >*/ {
   GTK_CSS_AREA_BORDER_BOX,
   GTK_CSS_AREA_PADDING_BOX,
   GTK_CSS_AREA_CONTENT_BOX
diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c
index 081b660..411050a 100644
--- a/gtk/gtkrendericon.c
+++ b/gtk/gtkrendericon.c
@@ -21,6 +21,7 @@
 
 #include "gtkrendericonprivate.h"
 
+#include "gtkcssimagebuiltinprivate.h"
 #include "gtkcssimagevalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstyleprivate.h"
diff --git a/gtk/gtkrendericonprivate.h b/gtk/gtkrendericonprivate.h
index f006e97..a92735a 100644
--- a/gtk/gtkrendericonprivate.h
+++ b/gtk/gtkrendericonprivate.h
@@ -24,7 +24,6 @@
 #include <cairo.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtkcssimagebuiltinprivate.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]