X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8870c26ecb03e87065fdb3617b8c47ca3c923a53..a4f964122df05b83a7753ea50fb0831b9781822d:/src/msw/accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 06aef88b60..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,7 +98,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
-#if !defined(__WIN16__) && !defined(__TWIN32__)
+#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16