summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-11-02 13:39:19 +0100
committerBenjamin Otte <otte@redhat.com>2012-11-04 15:24:18 +0100
commit1d6e896fef8937e64cf074621c4bfc72c86edb06 (patch)
tree701faff2fc0ab3ff2480787f75da74282f97f3ea
parent62f541474247db57d17833ad05ade2a2c5625f66 (diff)
downloadgtk+-1d6e896fef8937e64cf074621c4bfc72c86edb06.tar.gz
sizegroup: Move GtkSizeGroupMode to gtkenums.h
This is in preparation for the next patch, which would otherwise lead to conflicts.
-rw-r--r--gtk/gtkenums.h17
-rw-r--r--gtk/gtksizegroup.h17
2 files changed, 17 insertions, 17 deletions
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index af9ac31888..6a339637d0 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -804,6 +804,23 @@ typedef enum
} GtkDragResult;
/**
+ * GtkSizeGroupMode:
+ * @GTK_SIZE_GROUP_NONE: group has no effect
+ * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition
+ * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition
+ * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition
+ *
+ * The mode of the size group determines the directions in which the size
+ * group affects the requested sizes of its component widgets.
+ **/
+typedef enum {
+ GTK_SIZE_GROUP_NONE,
+ GTK_SIZE_GROUP_HORIZONTAL,
+ GTK_SIZE_GROUP_VERTICAL,
+ GTK_SIZE_GROUP_BOTH
+} GtkSizeGroupMode;
+
+/**
* 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
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 7af1338d86..3322c0ac76 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -58,23 +58,6 @@ struct _GtkSizeGroupClass
void (*_gtk_reserved4) (void);
};
-/**
- * GtkSizeGroupMode:
- * @GTK_SIZE_GROUP_NONE: group has no effect
- * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition
- * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition
- * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition
- *
- * The mode of the size group determines the directions in which the size
- * group affects the requested sizes of its component widgets.
- **/
-typedef enum {
- GTK_SIZE_GROUP_NONE,
- GTK_SIZE_GROUP_HORIZONTAL,
- GTK_SIZE_GROUP_VERTICAL,
- GTK_SIZE_GROUP_BOTH
-} GtkSizeGroupMode;
-
GType gtk_size_group_get_type (void) G_GNUC_CONST;
GtkSizeGroup * gtk_size_group_new (GtkSizeGroupMode mode);