X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..f3ff831f3be88834579fc9a0ce17f24745650faf:/include/wx/os2/accel.h diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index 226e0320bc..d0b9c02efc 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -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,50 +28,20 @@ class WXDLLEXPORT wxAcceleratorTable; // Hold no key down #define wxACCEL_NORMAL 0x00 -class WXDLLEXPORT wxAcceleratorEntry -{ -public: - wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) - { - m_flags = flags; m_keyCode = keyCode; m_command = cmd; - } - - inline void Set(int flags, int keyCode, int cmd) - { m_flags = flags; m_keyCode = keyCode; m_command = cmd; } - - inline int GetFlags() const { return m_flags; } - inline int GetKeyCode() const { return m_keyCode; } - inline int GetCommand() const { return m_command; } - - int m_flags; - int m_keyCode; // ASCII or virtual keycode - int m_command; // Command id to generate -}; - -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) 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) - { return m_refData == rAccel.m_refData; }; - inline bool operator != (const wxAcceleratorTable& rAccel) - { return m_refData != rAccel.m_refData; }; + virtual ~wxAcceleratorTable(); - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL(void) const; @@ -81,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_