X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c67451472112b3c7bb3b425cfab523b2d38d0cf..c9ccc09c64f4c29d4667796bef7b507d9e8d25ed:/include/wx/os2/accel.h?ds=sidebyside diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index f12542fd52..30dde8404a 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.h +// Name: wx/os2/accel.h // Purpose: wxAcceleratorTable class // Author: David Webster // Modified by: @@ -14,7 +14,7 @@ #include "wx/object.h" -class WXDLLEXPORT wxAcceleratorTable; +class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable; // Hold Ctrl key down #define wxACCEL_ALT 0x01 @@ -28,7 +28,7 @@ class WXDLLEXPORT wxAcceleratorTable; // Hold no key down #define wxACCEL_NORMAL 0x00 -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: @@ -38,20 +38,10 @@ public: ,const wxAcceleratorEntry vaEntries[] ); // Load from array - // Copy constructors - inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); } - inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); } + virtual ~wxAcceleratorTable(); - ~wxAcceleratorTable(); - - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel) - { if (*this == rAccel) return (*this); Ref(rAccel); return *this; }; - inline bool operator == (const wxAcceleratorTable& rAccel) - { return m_refData == rAccel.m_refData; }; - inline bool operator != (const wxAcceleratorTable& rAccel) - { return m_refData != rAccel.m_refData; }; - - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL(void) const; @@ -61,7 +51,8 @@ public: ) const; }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle); #endif // _WX_ACCEL_H_