X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..7c11806499166993dffcbb99139d5b248a2c6c82:/include/wx/msw/accel.h diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index b3fa62a00a..a2c82dea1e 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -24,10 +24,10 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject { public: // default ctor - wxAcceleratorTable(); + wxAcceleratorTable() : wxObject() { } // copy ctor - wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } + wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); } // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); @@ -35,11 +35,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); } @@ -47,7 +50,7 @@ public: void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL() const; - // translate the accelerator, return TRUE if done + // translate the accelerator, return true if done bool Translate(wxWindow *window, WXMSG *msg) const; private: