X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..bf7f7793e9c6e2fc3fcb8297ab7b3b56e3e9eea2:/include/wx/msw/accel.h diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index 34b3cd07d4..f65d24664f 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -12,6 +12,8 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ +class WXDLLIMPEXP_CORE wxWindow; + // ---------------------------------------------------------------------------- // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- @@ -20,10 +22,7 @@ class WXDLLEXPORT 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,12 @@ 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;