Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request GNOME/gtk!2145

1 files changed, 36 insertions, 97 deletions

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 32289d989d..c33fa708da 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2812,103 +2812,42 @@ cursor_draw (GtkDrawingArea *darea,
 }
 
 static const gchar *cursor_names[] = {
-    "all-scroll",
-    "arrow",
-    "bd_double_arrow",
-    "boat",
-    "bottom_left_corner",
-    "bottom_right_corner",
-    "bottom_side",
-    "bottom_tee",
-    "box_spiral",
-    "center_ptr",
-    "circle",
-    "clock",
-    "coffee_mug",
-    "copy",
-    "cross",
-    "crossed_circle",
-    "cross_reverse",
-    "crosshair",
-    "diamond_cross",
-    "dnd-ask",
-    "dnd-copy",
-    "dnd-link",
-    "dnd-move",
-    "dnd-none",
-    "dot",
-    "dotbox",
-    "double_arrow",
-    "draft_large",
-    "draft_small",
-    "draped_box",
-    "exchange",
-    "fd_double_arrow",
-    "fleur",
-    "gobbler",
-    "gumby",
-    "grab",
-    "grabbing",
-    "hand",
-    "hand1",
-    "hand2",
-    "heart",
-    "h_double_arrow",
-    "help",
-    "icon",
-    "iron_cross",
-    "left_ptr",
-    "left_ptr_help",
-    "left_ptr_watch",
-    "left_side",
-    "left_tee",
-    "leftbutton",
-    "link",
-    "ll_angle",
-    "lr_angle",
-    "man",
-    "middlebutton",
-    "mouse",
-    "move",
-    "pencil",
-    "pirate",
-    "plus",
-    "question_arrow",
-    "right_ptr",
-    "right_side",
-    "right_tee",
-    "rightbutton",
-    "rtl_logo",
-    "sailboat",
-    "sb_down_arrow",
-    "sb_h_double_arrow",
-    "sb_left_arrow",
-    "sb_right_arrow",
-    "sb_up_arrow",
-    "sb_v_double_arrow",
-    "shuttle",
-    "sizing",
-    "spider",
-    "spraycan",
-    "star",
-    "target",
-    "tcross",
-    "top_left_arrow",
-    "top_left_corner",
-    "top_right_corner",
-    "top_side",
-    "top_tee",
-    "trek",
-    "ul_angle",
-    "umbrella",
-    "ur_angle",
-    "v_double_arrow",
-    "vertical-text",
-    "watch",
-    "X_cursor",
-    "xterm",
-    "zoom-in",
-    "zoom-out"
+  "none",
+  "default",
+  "help",
+  "pointer",
+  "context-menu",
+  "progress",
+  "wait",
+  "cell",
+  "crosshair",
+  "text",
+  "vertical-text",
+  "alias",
+  "copy",
+  "no-drop",
+  "move",
+  "not-allowed",
+  "grab",
+  "grabbing",
+  "all-scroll",
+  "col-resize",
+  "row-resize",
+  "n-resize",
+  "e-resize",
+  "s-resize",
+  "w-resize",
+  "ne-resize",
+  "nw-resize",
+  "sw-resize",
+  "se-resize",
+  "ew-resize",
+  "ns-resize",
+  "nesw-resize",
+  "nwse-resize",
+  "zoom-in",
+  "zoom-out",
+  NULL
 };
 
 static GtkTreeModel *