X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48d1144bc4dabb9f8dd6f913e9a65d709e5995e3..ef609210f1656775cbbd09e45d36e2abb90e47d5:/src/msw/accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 0cc095c666..fbd23d9939 100644
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -30,10 +30,6 @@
 
 #include "wx/msw/private.h"
 
-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
-
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 #endif
@@ -88,12 +84,12 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     HACCEL hAccel =
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef UNICODE
-        ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
+        ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
 #else
         ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
 #endif
 #else
-        ::LoadAccelerators(wxGetInstance(), (const char *)resource);
+        ::LoadAccelerators(wxGetInstance(), (const wxChar *)resource);
 #endif
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = (hAccel != 0);
@@ -102,10 +98,10 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
+#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
-#if !defined(__WIN16__) && !defined(__TWIN32__)
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
@@ -135,8 +131,12 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     delete[] arr;
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
-#endif
 }
+#else
+wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
+{
+}
+#endif
 
 bool wxAcceleratorTable::Ok(void) const
 {