X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..315ebf688c0e69bed47cd3149158198b781b5f65:/src/msw/accel.cpp diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp index 559f3eaae7..563ce9929c 100644 --- a/src/msw/accel.cpp +++ b/src/msw/accel.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "accel.h" #endif @@ -41,6 +41,8 @@ public: protected: HACCEL m_hAccel; bool m_ok; + + DECLARE_NO_COPY_CLASS(wxAcceleratorRefData) }; #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData) @@ -56,7 +58,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData() if (m_hAccel) { // This function not available in WIN16 -#if !defined(__WIN16__) && !defined(__TWIN32__) +#if !defined(__WIN16__) DestroyAcceleratorTable((HACCEL) m_hAccel); #endif } @@ -78,7 +80,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) m_refData = new wxAcceleratorRefData; HACCEL hAccel = -#if defined(__WIN32__) && !defined(__TWIN32__) +#if defined(__WIN32__) #ifdef UNICODE ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource); #else @@ -94,7 +96,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource) extern int wxCharCodeWXToMSW(int id, bool *isVirtual); // Create from an array -#if !defined(__WIN16__) && !defined(__TWIN32__) && !defined(__WXWINE__) +#if !defined(__WIN16__) wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]) { // Not available in WIN16