X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..2209baaee3a8578450e204593b79ed155f340f68:/include/wx/os2/accel.h diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index 6e33d02ee7..60f3de60c0 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -35,20 +35,14 @@ public: wxAcceleratorTable(); wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource wxAcceleratorTable( int n - ,wxAcceleratorEntry vaEntries[] + ,const wxAcceleratorEntry vaEntries[] ); // Load from array - // Copy constructors - inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); } - inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); } - ~wxAcceleratorTable(); - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel) - { if (*this == rAccel) return (*this); Ref(rAccel); return *this; }; - inline bool operator == (const wxAcceleratorTable& rAccel) + inline bool operator== (const wxAcceleratorTable& rAccel) const { return m_refData == rAccel.m_refData; }; - inline bool operator != (const wxAcceleratorTable& rAccel) + inline bool operator!= (const wxAcceleratorTable& rAccel) const { return m_refData != rAccel.m_refData; }; bool Ok() const; @@ -63,5 +57,6 @@ public: WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle); #endif // _WX_ACCEL_H_