X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461dae941dac51a523a4280d3e1800143b720305..86b79b93fbbb0c2e90e6595f7fea0f979b80881c:/src/msw/accel.cpp?ds=sidebyside diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index b25c03c146..5f82d74601 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -59,10 +59,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData() { if (m_hAccel) { - // This function not available in WIN16 -#if !defined(__WIN16__) DestroyAcceleratorTable((HACCEL) m_hAccel); -#endif } m_hAccel = 0 ; } @@ -98,10 +95,8 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) extern int wxCharCodeWXToMSW(int id, bool *isVirtual); // Create from an array -#if !defined(__WIN16__) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { - // Not available in WIN16 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); } -#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 {