Compilation fix for old GCC versions.

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

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 226e0320bc4fd5e7ad05190549e18c162e657815..a0ee7448b31e80cce869cc0a4295558d4535d8b4 100644 (file)
--- 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
 
  // 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)
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)


@@ -55,23 +35,18 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
     wxAcceleratorTable( int                n
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
     wxAcceleratorTable( int                n

-                       ,wxAcceleratorEntry vaEntries[]
+                       ,const wxAcceleratorEntry vaEntries[]

                       ); // Load from array
 
                       ); // Load from array
 

-    // Copy constructors
-    inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); }
-
-    ~wxAcceleratorTable();
+    virtual ~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; };
     { 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; };
 
     { 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;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL(void) const;
 


@@ -83,5 +58,6 @@ public:
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 

+WXDLLEXPORT wxString wxPMTextToLabel(const wxString& rsTitle);

 #endif
     // _WX_ACCEL_H_
 #endif
     // _WX_ACCEL_H_