use explicit virtual keyword with overridden virtual methods

[wxWidgets.git] / include / wx / mac / carbon / accel.h

diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h
index 25acc73bead86a3abd1c93f9f7a91e8c8e6bddd4..742b460190671a96395dfb1157cbbe5892c4edad 100644 (file)
--- a/include/wx/mac/carbon/accel.h
+++ b/include/wx/mac/carbon/accel.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
-#endif
-

 #include "wx/string.h"
 #include "wx/event.h"
 
 #include "wx/string.h"
 #include "wx/event.h"
 


@@ -26,23 +22,15 @@ public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 

-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        : wxObject()
-    { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel)
-    { if (accel) Ref(*accel); }
-
-    ~wxAcceleratorTable();
+    virtual ~wxAcceleratorTable();

 
 

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

     { return m_refData == accel.m_refData; }
     { return m_refData == accel.m_refData; }

-    bool operator != (const wxAcceleratorTable& accel)
+    bool operator != (const wxAcceleratorTable& accel) const

     { return m_refData != accel.m_refData; }
 
     { return m_refData != accel.m_refData; }
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     int GetCommand( wxKeyEvent &event );
 };
 
     int GetCommand( wxKeyEvent &event );
 };