X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77c46f00b51b8476ec53691dabbc2fa8a7f6a165..61a69259c442653024f557707b5ca652d84919e0:/include/wx/msw/accel.h diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index 116d4cd598..6a64252a6f 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -12,22 +12,17 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "accel.h" -#endif +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(); - - // copy ctor - wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } + wxAcceleratorTable() { } // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); @@ -35,15 +30,8 @@ public: // initialize from array wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); - virtual ~wxAcceleratorTable(); - - 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 - { return !(*this == accel); } - - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL() const;