Unicode fix.

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 391937f23ae00cf84c6837bee528096d9931c92a..fbd23d9939bcf6f0fedc69268d11955c7a87a1fc 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -23,14 +23,12 @@
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/setup.h"
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/setup.h"

+#include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"

 #include "wx/msw/accel.h"
 
 #include "wx/msw/accel.h"
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
+#include "wx/msw/private.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)


@@ -61,7 +59,10 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
 {
   if (m_hAccel)
   {
 {
   if (m_hAccel)
   {

+    // This function not available in WIN16
+#if !defined(__WIN16__) && !defined(__TWIN32__)

     DestroyAcceleratorTable((HACCEL) m_hAccel);
     DestroyAcceleratorTable((HACCEL) m_hAccel);

+#endif

   }
   m_hAccel = 0 ;
 }
   }
   m_hAccel = 0 ;
 }


@@ -81,14 +82,14 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__TWIN32__)

 #ifdef UNICODE
 #ifdef UNICODE

-        ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
+        ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);

 #else
         ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
 #endif
 #else
 #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);
 #endif
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = (hAccel != 0);


@@ -97,8 +98,10 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array

-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__)
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])

 {
 {

+    // Not available in WIN16

     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];


@@ -129,6 +132,11 @@ wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }

+#else
+wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
+{
+}
+#endif

 
 bool wxAcceleratorTable::Ok(void) const
 {
 
 bool wxAcceleratorTable::Ok(void) const
 {