X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dddb8a2dde675b85bbe28399b921648a22e6be1..208458a7f59c7ba95a795597548fc8ae4be655cc:/include/wx/msw/accel.h diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index e68e66b653..34b3cd07d4 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,7 +20,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject { public: // default ctor - wxAcceleratorTable(); + wxAcceleratorTable() : wxObject() { } // copy ctor wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); } @@ -35,11 +31,14 @@ public: // initialize from array wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - virtual ~wxAcceleratorTable(); + wxAcceleratorTable& operator=(const wxAcceleratorTable& accel) + { + if ( *this != accel ) + Ref(accel); + return *this; + } - wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; } - bool operator==(const wxAcceleratorTable& accel) const - { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ) + bool operator==(const wxAcceleratorTable& accel) const; bool operator!=(const wxAcceleratorTable& accel) const { return !(*this == accel); }