Merge branch 'master' into open-with-dialog

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

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 73e1dce721d9e154e581dc4182528651a9a57028..e7dd7f56c9b5bc5641e1bed621dada2ea98fba43 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -49,8 +49,8 @@ G_BEGIN_DECLS
  * Controls how a widget deals with extra space in a single (x or y)
  * dimension.
  *
- * Alignment only matters if the widget receives a "too large"
- * allocation, for example if you packed the widget with the "expand"
+ * Alignment only matters if the widget receives a "too large" allocation,
+ * for example if you packed the widget with the #GtkWidget:expand
  * flag inside a #GtkBox, then the widget might get extra space.  If
  * you have for example a 16x16 icon inside a 32x32 space, the icon
  * could be scaled and stretched, it could be centered, or it could be
@@ -208,13 +208,6 @@ typedef enum
   GTK_MESSAGE_OTHER
 } GtkMessageType;
 
-typedef enum
-{
-  GTK_PIXELS,
-  GTK_INCHES,
-  GTK_CENTIMETERS
-} GtkMetricType;
-
 /**
  * GtkMovementStep:
  * @GTK_MOVEMENT_LOGICAL_POSITIONS: Move forward or back by graphemes
@@ -564,7 +557,6 @@ typedef enum
   GTK_SCROLL_NATURAL
 } GtkScrollablePolicy;
 
-
 G_END_DECLS