added wxRegEx::GetMatchCount (patch 938995)

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index b25c03c146069bac93d02046fe1019f8547704b1..5f82d74601d38830f3e6429b133e420de7fe517a 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -59,10 +59,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
 {
   if (m_hAccel)
   {
 {
   if (m_hAccel)
   {

-    // This function not available in WIN16
-#if !defined(__WIN16__)

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

-#endif

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


@@ -98,10 +95,8 @@ 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

-#if !defined(__WIN16__)

 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
 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];


@@ -133,14 +128,6 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }

-#else // Win16
-wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
-{
-    // No, we simply gracefully degrade; we don't expect the
-    // developer to pepper their code with #ifdefs just for this.
-    // wxFAIL_MSG("not implemented");
-}
-#endif // Win32/16

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