added wx/object.h include (bug 1398517)

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 121d5e349d50245ea0069bc693113ec6b3364076..34b3cd07d4835afe2ff7da2a01a404659e8eec20 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -6,16 +6,12 @@
 // Created:     31/7/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "accel.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
@@ -24,10 +20,10 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
-    wxAcceleratorTable();
+    wxAcceleratorTable() : wxObject() { }
 
     // copy ctor
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(accel) { Ref(accel); }
 
     // load from .rc resource (Windows specific)
     wxAcceleratorTable(const wxString& resource);
@@ -35,11 +31,14 @@ public:
     // 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; }
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
+    bool operator==(const wxAcceleratorTable& accel) const;
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
 
@@ -47,7 +46,7 @@ public:
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
-    // translate the accelerator, return TRUE if done
+    // translate the accelerator, return true if done
     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private: