X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..64ea838d8f4d1853b7d850db93ee565e901d099a:/include/wx/msw/accel.h diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index 34b3cd07d4..6a64252a6f 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -12,18 +12,17 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ +class WXDLLIMPEXP_FWD_CORE wxWindow; + // ---------------------------------------------------------------------------- // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorTable : public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { public: // default ctor - wxAcceleratorTable() : wxObject() { } - - // copy ctor - wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); } + wxAcceleratorTable() { } // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); @@ -31,18 +30,8 @@ public: // initialize from array wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - wxAcceleratorTable& operator=(const wxAcceleratorTable& accel) - { - if ( *this != accel ) - Ref(accel); - return *this; - } - - bool operator==(const wxAcceleratorTable& accel) const; - bool operator!=(const wxAcceleratorTable& accel) const - { return !(*this == accel); } - - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL() const;