X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/767e3be0fa755e435a070d145fa623e36762d7a8..2f4f6de77b28416db135359b824ec6d3c0f678fb:/include/wx/msw/accel.h?ds=sidebyside diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index a155c683be..ee7dc5dc32 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -12,10 +12,6 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "accel.h" -#endif - // ---------------------------------------------------------------------------- // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- @@ -24,10 +20,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject { public: // default ctor - wxAcceleratorTable(); - - // copy ctor - wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); } + wxAcceleratorTable() { } // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); @@ -35,16 +28,9 @@ public: // initialize from array wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - virtual ~wxAcceleratorTable(); - - wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; } - -#if WXWIN_COMPATIBILITY_2_4 - bool operator==(const wxAcceleratorTable& accel) const - { return m_refData == accel.m_refData; } + bool operator==(const wxAcceleratorTable& accel) const; bool operator!=(const wxAcceleratorTable& accel) const { return !(*this == accel); } -#endif bool Ok() const; void SetHACCEL(WXHACCEL hAccel);