Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added m_scanCode field to wxKeyEvent

Browse Source 
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
This commit is contained in:
Robert Roebling
1999-05-13 09:53:44 +00:00
parent cd8b9f13c7
commit b0e813a0c1
4 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/event.h
View File

@@ -658,6 +658,7 @@ public:
bool m_shiftDown; bool m_shiftDown;
bool m_altDown; bool m_altDown;
bool m_metaDown; bool m_metaDown;
bool m_scanCode;
}; };
// Size event class // Size event class

1
src/common/event.cpp
View File

@@ -326,6 +326,7 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
m_metaDown = FALSE; m_metaDown = FALSE;
m_altDown = FALSE; m_altDown = FALSE;
m_keyCode = 0; m_keyCode = 0;
m_scanCode = 0;
} }
void wxKeyEvent::CopyObject(wxObject& obj_d) const void wxKeyEvent::CopyObject(wxObject& obj_d) const

32
src/gtk/window.cpp
View File

@@ -353,6 +353,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
long key_code = 0; long key_code = 0;
switch (gdk_event->keyval) 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_BackSpace: key_code = WXK_BACK; break;
case GDK_ISO_Left_Tab: case GDK_ISO_Left_Tab:
case GDK_KP_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 ); wxKeyEvent event( wxEVT_KEY_DOWN );
event.SetTimestamp( gdk_event->time ); 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_altDown = (gdk_event->state & GDK_MOD1_MASK);
event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
event.m_keyCode = key_code; event.m_keyCode = key_code;
event.m_x = 0; event.m_scanCode = gdk_event->keyval;
event.m_y = 0; event.m_x = x;
event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );
bool ret = win->GetEventHandler()->ProcessEvent( event ); 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; long key_code = 0;
switch (gdk_event->keyval) 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_BackSpace: key_code = WXK_BACK; break;
case GDK_ISO_Left_Tab: case GDK_ISO_Left_Tab:
case GDK_KP_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 ); wxKeyEvent event( wxEVT_KEY_UP );
event.SetTimestamp( gdk_event->time ); 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_altDown = (gdk_event->state & GDK_MOD1_MASK);
event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
event.m_keyCode = key_code; event.m_keyCode = key_code;
event.m_x = 0; event.m_scanCode = gdk_event->keyval;
event.m_y = 0; event.m_x = x;
event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );
if (win->GetEventHandler()->ProcessEvent( event )) if (win->GetEventHandler()->ProcessEvent( event ))

32
src/gtk1/window.cpp
View File

@@ -353,6 +353,12 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
long key_code = 0; long key_code = 0;
switch (gdk_event->keyval) 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_BackSpace: key_code = WXK_BACK; break;
case GDK_ISO_Left_Tab: case GDK_ISO_Left_Tab:
case GDK_KP_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 ); wxKeyEvent event( wxEVT_KEY_DOWN );
event.SetTimestamp( gdk_event->time ); 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_altDown = (gdk_event->state & GDK_MOD1_MASK);
event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
event.m_keyCode = key_code; event.m_keyCode = key_code;
event.m_x = 0; event.m_scanCode = gdk_event->keyval;
event.m_y = 0; event.m_x = x;
event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );
bool ret = win->GetEventHandler()->ProcessEvent( event ); 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; long key_code = 0;
switch (gdk_event->keyval) 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_BackSpace: key_code = WXK_BACK; break;
case GDK_ISO_Left_Tab: case GDK_ISO_Left_Tab:
case GDK_KP_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 ); wxKeyEvent event( wxEVT_KEY_UP );
event.SetTimestamp( gdk_event->time ); 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_altDown = (gdk_event->state & GDK_MOD1_MASK);
event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
event.m_keyCode = key_code; event.m_keyCode = key_code;
event.m_x = 0; event.m_scanCode = gdk_event->keyval;
event.m_y = 0; event.m_x = x;
event.m_y = y;
event.SetEventObject( win ); event.SetEventObject( win );
if (win->GetEventHandler()->ProcessEvent( event )) if (win->GetEventHandler()->ProcessEvent( event ))