X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/os2/accel.h

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 226e0320bc..1614b06818 100644
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -28,26 +28,6 @@ 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
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
@@ -55,7 +35,7 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
     wxAcceleratorTable( int                n
-                       ,wxAcceleratorEntry vaEntries[]
+                       ,const wxAcceleratorEntry vaEntries[]
                       ); // Load from array
 
     // Copy constructors
@@ -66,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;
@@ -83,5 +63,6 @@ public:
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
+WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);
 #endif
     // _WX_ACCEL_H_