Merge lp:~unity-team/nux/nux.key-focus-dead-keys into lp:nux/2.0

[Brandon Schaefer]

* When you lose/get key focus make sure you reset the bool value

UNBLOCK

[Jay Taoko (jaytaoko)]

+1

review: Approve

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-03-09 06:55:00 +0000
+++ Nux/TextEntry.cpp	2012-03-10 01:46:18 +0000
@@ -291,6 +291,7 @@
   {
     bool retval = FALSE;
 
+#if defined(NUX_OS_LINUX)
     if (dead_key_mode_ && keysym == XK_space)
     {
       dead_key_mode_ = false;
@@ -307,7 +308,8 @@
     {
       return;
     }
-    
+#endif
+
     if (event_type == NUX_KEYDOWN)
       text_input_mode_ = true;
 
@@ -543,6 +545,7 @@
   {
     key_nav_mode_     = true;
     text_input_mode_  = false;
+    dead_key_mode_    = false;
     composition_mode_ = false;
     composition_string_.clear();
 
@@ -553,6 +556,7 @@
   {
     key_nav_mode_     = false;
     text_input_mode_  = false;
+    dead_key_mode_    = false;
     composition_mode_ = false;
     composition_string_.clear();
 
@@ -602,6 +606,7 @@
 
   bool TextEntry::HandledDeadKeys(int keysym, int state, const char* character)
   {
+#if defined(NUX_OS_LINUX)    
     /* Checks if the keysym between the first and last dead key */
     if ((keysym >= XK_dead_grave) && (keysym <= XK_dead_stroke) && !dead_key_mode_)
     {
@@ -627,10 +632,14 @@
       dead_key_mode_ = false;
     }
     return false;
+#else
+    return false;
+#endif        
   }
 
   bool TextEntry::HandledComposition(int keysym, const char* character)
   {
+#if defined(NUX_OS_LINUX)
     if (keysym == XK_Multi_key)
     {
       if (composition_mode_)
@@ -683,6 +692,9 @@
       }
     } 
     return false;
+#else
+    return false;
+#endif    
   }
 
   void TextEntry::SetText(const char* text)