From d8a9026b842655d23d839a639540bb134f734d84 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Wed, 29 Sep 2010 17:04:25 +0100
Subject: [PATCH] win32: Fix the CLUTTER_* keysym macros

In 4ee05f8e21d the namespace for the clutter keysym macros were
changed to CLUTTER_KEY_* but the win32 events backend was still
referring to the old names.
---
 clutter/win32/clutter-event-win32.c | 110 ++++++++++++++--------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c
index 8c7df72af..a2a3aa30c 100644
--- a/clutter/win32/clutter-event-win32.c
+++ b/clutter/win32/clutter-event-win32.c
@@ -71,60 +71,60 @@ static const struct
   gushort win_sym, clutter_sym;
 } clutter_win32_key_map[] =
   {
-    { VK_CANCEL, CLUTTER_Cancel },
-    { VK_BACK, CLUTTER_BackSpace },
-    { VK_TAB, CLUTTER_Tab },
-    { VK_CLEAR, CLUTTER_Clear },
-    { VK_RETURN, CLUTTER_Return },
-    { VK_MENU, CLUTTER_Menu },
-    { VK_PAUSE, CLUTTER_Pause },
-    { VK_HANGUL, CLUTTER_Hangul },
-    { VK_KANJI, CLUTTER_Kanji },
-    { VK_ESCAPE, CLUTTER_Escape },
-    { VK_SPACE, CLUTTER_space },
-    { VK_PRIOR, CLUTTER_Prior },
-    { VK_NEXT, CLUTTER_Next },
-    { VK_END, CLUTTER_End },
-    { VK_HOME, CLUTTER_Home },
-    { VK_LEFT, CLUTTER_Left },
-    { VK_UP, CLUTTER_Up },
-    { VK_RIGHT, CLUTTER_Right },
-    { VK_DOWN, CLUTTER_Down },
-    { VK_SELECT, CLUTTER_Select },
-    { VK_PRINT, CLUTTER_Print },
-    { VK_EXECUTE, CLUTTER_Execute },
-    { VK_INSERT, CLUTTER_Insert },
-    { VK_DELETE, CLUTTER_Delete },
-    { VK_HELP, CLUTTER_Help },
-    { VK_MULTIPLY, CLUTTER_multiply },
-    { VK_F1, CLUTTER_F1 },
-    { VK_F2, CLUTTER_F2 },
-    { VK_F3, CLUTTER_F3 },
-    { VK_F4, CLUTTER_F4 },
-    { VK_F5, CLUTTER_F5 },
-    { VK_F6, CLUTTER_F6 },
-    { VK_F7, CLUTTER_F7 },
-    { VK_F8, CLUTTER_F8 },
-    { VK_F9, CLUTTER_F9 },
-    { VK_F10, CLUTTER_F10 },
-    { VK_F11, CLUTTER_F11 },
-    { VK_F12, CLUTTER_F12 },
-    { VK_F13, CLUTTER_F13 },
-    { VK_F14, CLUTTER_F14 },
-    { VK_F15, CLUTTER_F15 },
-    { VK_F16, CLUTTER_F16 },
-    { VK_F17, CLUTTER_F17 },
-    { VK_F18, CLUTTER_F18 },
-    { VK_F19, CLUTTER_F19 },
-    { VK_F20, CLUTTER_F20 },
-    { VK_F21, CLUTTER_F21 },
-    { VK_F22, CLUTTER_F22 },
-    { VK_F23, CLUTTER_F23 },
-    { VK_F24, CLUTTER_F24 },
-    { VK_LSHIFT, CLUTTER_Shift_L },
-    { VK_RSHIFT, CLUTTER_Shift_R },
-    { VK_LCONTROL, CLUTTER_Control_L },
-    { VK_RCONTROL, CLUTTER_Control_R }
+    { VK_CANCEL, CLUTTER_KEY_Cancel },
+    { VK_BACK, CLUTTER_KEY_BackSpace },
+    { VK_TAB, CLUTTER_KEY_Tab },
+    { VK_CLEAR, CLUTTER_KEY_Clear },
+    { VK_RETURN, CLUTTER_KEY_Return },
+    { VK_MENU, CLUTTER_KEY_Menu },
+    { VK_PAUSE, CLUTTER_KEY_Pause },
+    { VK_HANGUL, CLUTTER_KEY_Hangul },
+    { VK_KANJI, CLUTTER_KEY_Kanji },
+    { VK_ESCAPE, CLUTTER_KEY_Escape },
+    { VK_SPACE, CLUTTER_KEY_space },
+    { VK_PRIOR, CLUTTER_KEY_Prior },
+    { VK_NEXT, CLUTTER_KEY_Next },
+    { VK_END, CLUTTER_KEY_End },
+    { VK_HOME, CLUTTER_KEY_Home },
+    { VK_LEFT, CLUTTER_KEY_Left },
+    { VK_UP, CLUTTER_KEY_Up },
+    { VK_RIGHT, CLUTTER_KEY_Right },
+    { VK_DOWN, CLUTTER_KEY_Down },
+    { VK_SELECT, CLUTTER_KEY_Select },
+    { VK_PRINT, CLUTTER_KEY_Print },
+    { VK_EXECUTE, CLUTTER_KEY_Execute },
+    { VK_INSERT, CLUTTER_KEY_Insert },
+    { VK_DELETE, CLUTTER_KEY_Delete },
+    { VK_HELP, CLUTTER_KEY_Help },
+    { VK_MULTIPLY, CLUTTER_KEY_multiply },
+    { VK_F1, CLUTTER_KEY_F1 },
+    { VK_F2, CLUTTER_KEY_F2 },
+    { VK_F3, CLUTTER_KEY_F3 },
+    { VK_F4, CLUTTER_KEY_F4 },
+    { VK_F5, CLUTTER_KEY_F5 },
+    { VK_F6, CLUTTER_KEY_F6 },
+    { VK_F7, CLUTTER_KEY_F7 },
+    { VK_F8, CLUTTER_KEY_F8 },
+    { VK_F9, CLUTTER_KEY_F9 },
+    { VK_F10, CLUTTER_KEY_F10 },
+    { VK_F11, CLUTTER_KEY_F11 },
+    { VK_F12, CLUTTER_KEY_F12 },
+    { VK_F13, CLUTTER_KEY_F13 },
+    { VK_F14, CLUTTER_KEY_F14 },
+    { VK_F15, CLUTTER_KEY_F15 },
+    { VK_F16, CLUTTER_KEY_F16 },
+    { VK_F17, CLUTTER_KEY_F17 },
+    { VK_F18, CLUTTER_KEY_F18 },
+    { VK_F19, CLUTTER_KEY_F19 },
+    { VK_F20, CLUTTER_KEY_F20 },
+    { VK_F21, CLUTTER_KEY_F21 },
+    { VK_F22, CLUTTER_KEY_F22 },
+    { VK_F23, CLUTTER_KEY_F23 },
+    { VK_F24, CLUTTER_KEY_F24 },
+    { VK_LSHIFT, CLUTTER_KEY_Shift_L },
+    { VK_RSHIFT, CLUTTER_KEY_Shift_R },
+    { VK_LCONTROL, CLUTTER_KEY_Control_L },
+    { VK_RCONTROL, CLUTTER_KEY_Control_R }
   };
 #define CLUTTER_WIN32_KEY_MAP_SIZE (sizeof (clutter_win32_key_map) \
 				    / sizeof (clutter_win32_key_map[0]))
@@ -652,7 +652,7 @@ message_translate (ClutterBackend *backend,
 		 application might be able to do something with the
 		 scan code so we might as well still generate the
 		 event */
-	      event->key.keyval = CLUTTER_VoidSymbol;
+	      event->key.keyval = CLUTTER_KEY_VoidSymbol;
 
 	    /* Get the unicode value of the keypress again using the
 	       full modifier state */