summaryrefslogtreecommitdiff
path: root/gtk/gtkenums.h
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-11-30 16:27:28 +0100
committerCosimo Cecchi <cosimoc@gnome.org>2010-11-30 16:27:28 +0100
commitcb916f274673322bb6bfe6ac7256d3526a15cbfa (patch)
tree84024c4a3a59902ccb8247b7b62ca1231fde66ed /gtk/gtkenums.h
parent5f942b123248712f86fe7bfc3724b899a2bc0844 (diff)
parent922324553be10f847d4bdc3a177e641887a2921d (diff)
downloadgtk+-cb916f274673322bb6bfe6ac7256d3526a15cbfa.tar.gz
Merge branch 'master' into open-with-dialog
Conflicts: docs/reference/gtk/gtk3-sections.txt gtk/gtk.symbols
Diffstat (limited to 'gtk/gtkenums.h')
-rw-r--r--gtk/gtkenums.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 85352d6ae5..e7dd7f56c9 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -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