1. registry files corresponding to the recent registry.h changes

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 448cec07ea5d0915306d81e82cb451b1b0271e7a..3e68b6bcaadb9de6237d3f70c41e7a27dc812681 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/setup.h"
+#include "wx/window.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -62,7 +63,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
   if (m_hAccel)
   {
     // This function not available in WIN16
-#ifndef __WIN16__
+#if !defined(__WIN16__) && !defined(__TWIN32__)
     DestroyAcceleratorTable((HACCEL) m_hAccel);
 #endif
   }
@@ -84,7 +85,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
@@ -103,7 +104,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];