X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..75a937411ce0aa5856b135f2d0f9406ac83e9cce:/src/msw/accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index a8f2b551cf..a5feca7c4b 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -51,7 +51,7 @@ protected:
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
-  m_ok = FALSE;
+  m_ok = false;
   m_hAccel = 0;
 }
 
@@ -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[])
@@ -120,7 +120,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
         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);