X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/accel.cpp diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index dfcb758f2b..1dc9e4efc8 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/accel.cpp +// Name: src/msw/accel.cpp // Purpose: wxAcceleratorTable // Author: Julian Smart // Modified by: @@ -33,8 +33,7 @@ #include "wx/accel.h" #include "wx/msw/private.h" - -extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual); +#include "wx/msw/private/keyboard.h" IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject) @@ -90,7 +89,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) { m_refData = new wxAcceleratorRefData; - HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.wx_str()); + HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.t_str()); M_ACCELDATA->m_hAccel = hAccel; M_ACCELDATA->m_ok = hAccel != 0; } @@ -105,19 +104,15 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] { int flags = entries[i].GetFlags(); - BYTE fVirt = 0; + BYTE fVirt = FVIRTKEY; if ( flags & wxACCEL_ALT ) - fVirt |= FALT | FVIRTKEY; + fVirt |= FALT; if ( flags & wxACCEL_SHIFT ) - fVirt |= FSHIFT | FVIRTKEY; + fVirt |= FSHIFT; if ( flags & wxACCEL_CTRL ) - fVirt |= FCONTROL | FVIRTKEY; - - bool isVirtual; + fVirt |= FCONTROL; - WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual); - if (isVirtual) - fVirt |= FVIRTKEY; + WORD key = wxMSWKeyboard::WXToVK(entries[i].GetKeyCode()); arr[i].fVirt = fVirt; arr[i].key = key; @@ -153,7 +148,7 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const { MSG *msg = (MSG *)wxmsg; - return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); + return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); } #endif // wxUSE_ACCEL