Changes for 16-bit BC++ (not there yet), GnuWin32; typetest sample

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 391937f23ae00cf84c6837bee528096d9931c92a..448cec07ea5d0915306d81e82cb451b1b0271e7a 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -61,7 +61,10 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
 {
   if (m_hAccel)
   {
+    // This function not available in WIN16
+#ifndef __WIN16__
     DestroyAcceleratorTable((HACCEL) m_hAccel);
+#endif
   }
   m_hAccel = 0 ;
 }
@@ -97,8 +100,10 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
+    // Not available in WIN16
+#ifndef __WIN16__
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
@@ -128,6 +133,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
     delete[] arr;
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
+#endif
 }
 
 bool wxAcceleratorTable::Ok(void) const