From f8f7cff4368ee960f63f61d0dd32eacdd471800b Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 18 Feb 2009 17:15:40 +0000 Subject: [PATCH] remove unused wxKeyEvent member m_scanCode git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 4 ---- src/common/event.cpp | 3 --- src/dfb/window.cpp | 1 - src/gtk/window.cpp | 1 - src/gtk1/window.cpp | 1 - src/mgl/window.cpp | 1 - 6 files changed, 11 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index 215acd74a4..70fd7df823 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -1524,7 +1524,6 @@ public: m_keyCode = evt.m_keyCode; - m_scanCode = evt.m_scanCode; m_rawCode = evt.m_rawCode; m_rawFlags = evt.m_rawFlags; #if wxUSE_UNICODE @@ -1539,9 +1538,6 @@ public: long m_keyCode; - // FIXME: what is this for? relation to m_rawXXX? - bool m_scanCode; - #if wxUSE_UNICODE // This contains the full Unicode character // in a character events in Unicode mode diff --git a/src/common/event.cpp b/src/common/event.cpp index 410751fb89..7d98a3e6d0 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -761,7 +761,6 @@ wxKeyEvent::wxKeyEvent(wxEventType type) { m_eventType = type; m_keyCode = 0; - m_scanCode = 0; #if wxUSE_UNICODE m_uniChar = 0; #endif @@ -775,8 +774,6 @@ wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) m_y = evt.m_y; m_keyCode = evt.m_keyCode; - - m_scanCode = evt.m_scanCode; m_rawCode = evt.m_rawCode; m_rawFlags = evt.m_rawFlags; diff --git a/src/dfb/window.cpp b/src/dfb/window.cpp index 548616b0fb..855c6c006e 100644 --- a/src/dfb/window.cpp +++ b/src/dfb/window.cpp @@ -993,7 +993,6 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_) event.SetTimestamp(wxDFB_EVENT_TIMESTAMP(e)); event.m_rawCode = e.key_code; event.m_keyCode = GetTranslatedKeyCode(e.key_id); - event.m_scanCode = 0; // not used by wx at all #if wxUSE_UNICODE event.m_uniChar = e.key_symbol; #endif diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index b0b607384a..af7af1f127 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -683,7 +683,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; - event.m_scanCode = gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = 0; #if wxUSE_UNICODE diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index ba93c71dd9..d9c45bfa80 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -923,7 +923,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK) != 0; - event.m_scanCode = gdk_event->keyval; event.m_rawCode = (wxUint32) gdk_event->keyval; event.m_rawFlags = 0; #if wxUSE_UNICODE diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp index 275d2e801e..ac24d5b5dc 100644 --- a/src/mgl/window.cpp +++ b/src/mgl/window.cpp @@ -460,7 +460,6 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e) event.SetEventObject(win); event.SetTimestamp(e->when); event.m_keyCode = wxScanToKeyCode(e, true); - event.m_scanCode = 0; // not used by wx at all event.m_x = where.x; event.m_y = where.y; event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0; -- 2.47.2