Move stdpath into base on msw as well.

[wxWidgets.git] / src / msw / accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index cad9c19c303fa9fce28914540d21626ede79facd..a5feca7c4b2ef21f72fbf34b125e2eb33f60ca66 100644 (file)
--- 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);
 }
 
     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[])
 
 // Create from an array
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])


@@ -114,13 +114,13 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
         bool isVirtual;
 
 
         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;
         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);
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);