Added m_scanCode field to wxKeyEvent

  Added a few more WXK symbols to wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 4179febd93e3969b5090ecec3a6ca2744f449155..1b5f6c0bfab7ff3d3fabab5b4dcb2ddf8ddcc5d9 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -658,6 +658,7 @@ public:
     bool          m_shiftDown;
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_shiftDown;
     bool          m_altDown;
     bool          m_metaDown;

+    bool          m_scanCode;

 };
 
 // Size event class
 };
 
 // Size event class

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 9f66f5bbe0bc68ef28eb87cd22f6fbeaf35bbea2..fc2779379ae7c67f0748af94409c4ad8fccc8960 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -326,6 +326,7 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_metaDown = FALSE;
     m_altDown = FALSE;
     m_keyCode = 0;
     m_metaDown = FALSE;
     m_altDown = FALSE;
     m_keyCode = 0;

+    m_scanCode = 0;

 }
 
 void wxKeyEvent::CopyObject(wxObject& obj_d) const
 }
 
 void wxKeyEvent::CopyObject(wxObject& obj_d) const

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 03061a90c8449f4dbd85f4bc0ba2d2e9d4139853..fa72030a8ccaa592a43126f8eddc1affa103d754 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -353,6 +353,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     long key_code = 0;
     switch (gdk_event->keyval)
     {
     long key_code = 0;
     switch (gdk_event->keyval)
     {

+        case GDK_Shift_L:
+       case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
+        case GDK_Control_L:
+       case GDK_Control_R:     key_code = WXK_CONTROL;     break;
+       case GDK_Menu:          key_code = WXK_MENU;        break;
+       case GDK_Help:          key_code = WXK_HELP;        break;

         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:
         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:


@@ -429,7 +435,10 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
         }
     }
 
         }
     }
 

-    if (!key_code) return FALSE;
+    int x = 0;
+    int y = 0;
+    GdkModifierType state;
+    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);

 
     wxKeyEvent event( wxEVT_KEY_DOWN );
     event.SetTimestamp( gdk_event->time );
 
     wxKeyEvent event( wxEVT_KEY_DOWN );
     event.SetTimestamp( gdk_event->time );


@@ -438,8 +447,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;

-    event.m_x = 0;
-    event.m_y = 0;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;

     event.SetEventObject( win );
 
     bool ret = win->GetEventHandler()->ProcessEvent( event );
     event.SetEventObject( win );
 
     bool ret = win->GetEventHandler()->ProcessEvent( event );


@@ -542,6 +552,12 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
     long key_code = 0;
     switch (gdk_event->keyval)
     {
     long key_code = 0;
     switch (gdk_event->keyval)
     {

+        case GDK_Shift_L:
+       case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
+        case GDK_Control_L:
+       case GDK_Control_R:     key_code = WXK_CONTROL;     break;
+       case GDK_Menu:          key_code = WXK_MENU;        break;
+       case GDK_Help:          key_code = WXK_HELP;        break;

         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:
         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:


@@ -618,7 +634,10 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
         }
     }
 
         }
     }
 

-    if (!key_code) return FALSE;
+    int x = 0;
+    int y = 0;
+    GdkModifierType state;
+    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);

 
     wxKeyEvent event( wxEVT_KEY_UP );
     event.SetTimestamp( gdk_event->time );
 
     wxKeyEvent event( wxEVT_KEY_UP );
     event.SetTimestamp( gdk_event->time );


@@ -627,8 +646,9 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;

-    event.m_x = 0;
-    event.m_y = 0;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;

     event.SetEventObject( win );
 
     if (win->GetEventHandler()->ProcessEvent( event ))
     event.SetEventObject( win );
 
     if (win->GetEventHandler()->ProcessEvent( event ))

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 03061a90c8449f4dbd85f4bc0ba2d2e9d4139853..fa72030a8ccaa592a43126f8eddc1affa103d754 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -353,6 +353,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     long key_code = 0;
     switch (gdk_event->keyval)
     {
     long key_code = 0;
     switch (gdk_event->keyval)
     {

+        case GDK_Shift_L:
+       case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
+        case GDK_Control_L:
+       case GDK_Control_R:     key_code = WXK_CONTROL;     break;
+       case GDK_Menu:          key_code = WXK_MENU;        break;
+       case GDK_Help:          key_code = WXK_HELP;        break;

         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:
         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:


@@ -429,7 +435,10 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
         }
     }
 
         }
     }
 

-    if (!key_code) return FALSE;
+    int x = 0;
+    int y = 0;
+    GdkModifierType state;
+    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);

 
     wxKeyEvent event( wxEVT_KEY_DOWN );
     event.SetTimestamp( gdk_event->time );
 
     wxKeyEvent event( wxEVT_KEY_DOWN );
     event.SetTimestamp( gdk_event->time );


@@ -438,8 +447,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;

-    event.m_x = 0;
-    event.m_y = 0;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;

     event.SetEventObject( win );
 
     bool ret = win->GetEventHandler()->ProcessEvent( event );
     event.SetEventObject( win );
 
     bool ret = win->GetEventHandler()->ProcessEvent( event );


@@ -542,6 +552,12 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
     long key_code = 0;
     switch (gdk_event->keyval)
     {
     long key_code = 0;
     switch (gdk_event->keyval)
     {

+        case GDK_Shift_L:
+       case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
+        case GDK_Control_L:
+       case GDK_Control_R:     key_code = WXK_CONTROL;     break;
+       case GDK_Menu:          key_code = WXK_MENU;        break;
+       case GDK_Help:          key_code = WXK_HELP;        break;

         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:
         case GDK_BackSpace:     key_code = WXK_BACK;        break;
         case GDK_ISO_Left_Tab:
         case GDK_KP_Tab:


@@ -618,7 +634,10 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
         }
     }
 
         }
     }
 

-    if (!key_code) return FALSE;
+    int x = 0;
+    int y = 0;
+    GdkModifierType state;
+    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);

 
     wxKeyEvent event( wxEVT_KEY_UP );
     event.SetTimestamp( gdk_event->time );
 
     wxKeyEvent event( wxEVT_KEY_UP );
     event.SetTimestamp( gdk_event->time );


@@ -627,8 +646,9 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;
     event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
     event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
     event.m_keyCode = key_code;

-    event.m_x = 0;
-    event.m_y = 0;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;

     event.SetEventObject( win );
 
     if (win->GetEventHandler()->ProcessEvent( event ))
     event.SetEventObject( win );
 
     if (win->GetEventHandler()->ProcessEvent( event ))