extracted wxGtkString in a separate file, it's also needed by wxX11

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

diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h
index 1614b06818220af7d555a5c9384cb6d3cfe347e3..a0ee7448b31e80cce869cc0a4295558d4535d8b4 100644 (file)
--- a/include/wx/os2/accel.h
+++ b/include/wx/os2/accel.h
@@ -38,20 +38,15 @@ public:
                        ,const wxAcceleratorEntry vaEntries[]
                       ); // Load from array
 
-    // Copy constructors
-    inline wxAcceleratorTable(const wxAcceleratorTable& rAccel) { Ref(rAccel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* pAccel) { if (pAccel) Ref(*pAccel); }
+    virtual ~wxAcceleratorTable();
 
-    ~wxAcceleratorTable();
-
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel)
-    { if (*this == rAccel) return (*this); Ref(rAccel); return *this; };
     inline bool operator== (const wxAcceleratorTable& rAccel) const
     { return m_refData == rAccel.m_refData; };
     inline bool operator!= (const wxAcceleratorTable& rAccel) const
     { 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;