remove unused wxKeyEvent member m_scanCode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1524,7 +1524,6 @@ public:
|
|||||||
|
|
||||||
m_keyCode = evt.m_keyCode;
|
m_keyCode = evt.m_keyCode;
|
||||||
|
|
||||||
m_scanCode = evt.m_scanCode;
|
|
||||||
m_rawCode = evt.m_rawCode;
|
m_rawCode = evt.m_rawCode;
|
||||||
m_rawFlags = evt.m_rawFlags;
|
m_rawFlags = evt.m_rawFlags;
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
@@ -1539,9 +1538,6 @@ public:
|
|||||||
|
|
||||||
long m_keyCode;
|
long m_keyCode;
|
||||||
|
|
||||||
// FIXME: what is this for? relation to m_rawXXX?
|
|
||||||
bool m_scanCode;
|
|
||||||
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
// This contains the full Unicode character
|
// This contains the full Unicode character
|
||||||
// in a character events in Unicode mode
|
// in a character events in Unicode mode
|
||||||
|
@@ -761,7 +761,6 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
|
|||||||
{
|
{
|
||||||
m_eventType = type;
|
m_eventType = type;
|
||||||
m_keyCode = 0;
|
m_keyCode = 0;
|
||||||
m_scanCode = 0;
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
m_uniChar = 0;
|
m_uniChar = 0;
|
||||||
#endif
|
#endif
|
||||||
@@ -775,8 +774,6 @@ wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
|
|||||||
m_y = evt.m_y;
|
m_y = evt.m_y;
|
||||||
|
|
||||||
m_keyCode = evt.m_keyCode;
|
m_keyCode = evt.m_keyCode;
|
||||||
|
|
||||||
m_scanCode = evt.m_scanCode;
|
|
||||||
m_rawCode = evt.m_rawCode;
|
m_rawCode = evt.m_rawCode;
|
||||||
m_rawFlags = evt.m_rawFlags;
|
m_rawFlags = evt.m_rawFlags;
|
||||||
|
|
||||||
|
@@ -993,7 +993,6 @@ void wxWindowDFB::HandleKeyEvent(const wxDFBWindowEvent& event_)
|
|||||||
event.SetTimestamp(wxDFB_EVENT_TIMESTAMP(e));
|
event.SetTimestamp(wxDFB_EVENT_TIMESTAMP(e));
|
||||||
event.m_rawCode = e.key_code;
|
event.m_rawCode = e.key_code;
|
||||||
event.m_keyCode = GetTranslatedKeyCode(e.key_id);
|
event.m_keyCode = GetTranslatedKeyCode(e.key_id);
|
||||||
event.m_scanCode = 0; // not used by wx at all
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
event.m_uniChar = e.key_symbol;
|
event.m_uniChar = e.key_symbol;
|
||||||
#endif
|
#endif
|
||||||
|
@@ -683,7 +683,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
|
|||||||
event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
|
event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
|
||||||
event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
|
event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
|
||||||
event.m_metaDown = (gdk_event->state & GDK_META_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_rawCode = (wxUint32) gdk_event->keyval;
|
||||||
event.m_rawFlags = 0;
|
event.m_rawFlags = 0;
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
|
@@ -923,7 +923,6 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
|
|||||||
event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
|
event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
|
||||||
event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
|
event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
|
||||||
event.m_metaDown = (gdk_event->state & GDK_MOD2_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_rawCode = (wxUint32) gdk_event->keyval;
|
||||||
event.m_rawFlags = 0;
|
event.m_rawFlags = 0;
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
|
@@ -460,7 +460,6 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
|
|||||||
event.SetEventObject(win);
|
event.SetEventObject(win);
|
||||||
event.SetTimestamp(e->when);
|
event.SetTimestamp(e->when);
|
||||||
event.m_keyCode = wxScanToKeyCode(e, true);
|
event.m_keyCode = wxScanToKeyCode(e, true);
|
||||||
event.m_scanCode = 0; // not used by wx at all
|
|
||||||
event.m_x = where.x;
|
event.m_x = where.x;
|
||||||
event.m_y = where.y;
|
event.m_y = where.y;
|
||||||
event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
|
event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
|
||||||
|
Reference in New Issue
Block a user