summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-12-15 14:52:17 +0100
committerBenjamin Otte <otte@redhat.com>2015-12-16 01:50:00 +0100
commit75d7f7e756fa129e6ccb8e8df6b35b1acfec554f (patch)
treedd1b61c40927ae993768a038d0b705c638f09e87
parent65b056142bc5e221ad61a3d118234bbfa4c6c977 (diff)
downloadgtk+-75d7f7e756fa129e6ccb8e8df6b35b1acfec554f.tar.gz
css: Move enum
I want to use it for a gadget, so it's better in the generic file.
-rw-r--r--gtk/gtkcssimagebuiltinprivate.h33
-rw-r--r--gtk/gtkcsstypesprivate.h33
-rw-r--r--gtk/gtkrendericon.c1
-rw-r--r--gtk/gtkrendericonprivate.h1
4 files changed, 34 insertions, 34 deletions
diff --git a/gtk/gtkcssimagebuiltinprivate.h b/gtk/gtkcssimagebuiltinprivate.h
index 8bbdf4d88a..9ed8a542c9 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 1896bfe4af..1660db8536 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 081b660014..411050a6b5 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 f006e97105..a92735a96a 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