Bug #1040683: Remove assert when deleting menu entry.

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 26831188f4304d97becdfbe4ce983f5a4d3a0b81..a2c82dea1e770ae9a960a6f3ca533a664804207a 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
 {
 public:
     // default ctor

-    wxAcceleratorTable();
+    wxAcceleratorTable() : wxObject() { }

 
     // copy ctor
     wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); }
 
     // copy ctor
     wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); }


@@ -35,17 +35,16 @@ public:
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 

-    virtual ~wxAcceleratorTable();
+    wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
+    {
+        if ( *this != accel )
+            Ref(accel);
+        return *this;
+    }

 
 

-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
-
-// #if WXWIN_COMPATIBILITY_2_4
-// fixme: it is still used in 'operator =' above
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; }
+    bool operator==(const wxAcceleratorTable& accel) const;

     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }

-// #endif

 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);
 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);