X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..71b8c213cb2c676b4715ef37e6155da3601f7881:/src/msw/accel.cpp diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 3e68b6bcaa..06aef88b60 100644 --- 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 @@ -101,10 +102,10 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) extern int wxCharCodeWXToMSW(int id, bool *isVirtual); // Create from an array +#if !defined(__WIN16__) && !defined(__TWIN32__) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { // Not available in WIN16 -#if !defined(__WIN16__) && !defined(__TWIN32__) m_refData = new wxAcceleratorRefData; ACCEL* arr = new ACCEL[n]; @@ -134,8 +135,12 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[] delete[] arr; M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0); -#endif } +#else +wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[]) +{ +} +#endif bool wxAcceleratorTable::Ok(void) const {