remove unused wxKeyEvent member m_scanCode

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 215acd74a4ee2568742e0d201188b9e0f97a10f8..70fd7df823d32e6e5e928adedc573a598a4c7492 100644 (file)
--- 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 410751fb89a23b40aff1faf969695f14067739c8..7d98a3e6d0f8bff41f0da0ab31eef7929dd8de39 100644 (file)
--- 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 548616b0fb7b449c2981cb8cb0207a20bbed2c6e..855c6c006e45d8ad92a50230e31ba68d9c2361e5 100644 (file)
--- 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 b0b607384a3877b760b33bdb8374131ec5ff45ff..af7af1f127e4e8bc600079e8c4ef96bad90d280d 100644 (file)
--- 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 ba93c71dd9f0d0461046363fb95d2f91f1d3bd47..d9c45bfa80383ed32da669cd97d6fb23d832773b 100644 (file)
--- 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 275d2e801e922b883584f7dfa0d61b82a61cf9bb..ac24d5b5dcb1d7d9e76448c99f7ab6dbaee7ab15 100644 (file)
--- 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;