X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/907173e51df6d2a91d65463ddf6ce810d3fd921a..6d3b231a02b761671d042c2f8989048ba49125e8:/src/msw/accel.cpp?ds=sidebyside diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index cad9c19c30..a5feca7c4b 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -92,7 +92,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) M_ACCELDATA->m_ok = (hAccel != 0); } -extern int wxCharCodeWXToMSW(int id, bool *isVirtual); +extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual); // Create from an array wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) @@ -114,13 +114,13 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] bool isVirtual; - WORD key = (WORD)wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual); + WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual); if (isVirtual) fVirt |= FVIRTKEY; arr[i].fVirt = fVirt; arr[i].key = key; - arr[i].cmd = entries[i].GetCommand(); + arr[i].cmd = (WORD)entries[i].GetCommand(); } M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);