Fixed wxFileDialog and VC++ DLL compilation

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 680ec4e770561e1ec76f42a9a3a046d97c89c4ce..0cc095c6661d65a6f6fce048f71f02a2190e8870 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -26,9 +26,10 @@
 #include "wx/window.h"
 #endif
 
-#include "wx/msw/private.h"
 #include "wx/msw/accel.h"
 
+#include "wx/msw/private.h"
+
 #ifdef LoadAccelerators
 #undef LoadAccelerators
 #endif
@@ -63,7 +64,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
   if (m_hAccel)
   {
     // This function not available in WIN16
-#ifndef __WIN16__
+#if !defined(__WIN16__) && !defined(__TWIN32__)
     DestroyAcceleratorTable((HACCEL) m_hAccel);
 #endif
   }
@@ -85,7 +86,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef UNICODE
         ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
 #else
@@ -104,7 +105,7 @@ extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
-#ifndef __WIN16__
+#if !defined(__WIN16__) && !defined(__TWIN32__)
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];