added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

[wxWidgets.git] / include / wx / os2 / accel.h

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index f12542fd523b879922b58255c3615bd81c10f24c..1614b06818220af7d555a5c9384cb6d3cfe347e3 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -46,9 +46,9 @@ public:
 
     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 +63,6 @@ public:
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
+WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);
 #endif
     // _WX_ACCEL_H_