1. We don't need GetTopLevelParent() here, we already have wxGetTopLevelParent()

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

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index c2f061e1765fb8043777a0f20093662e148232d4..17f7e44fa47de2a2cd482dcad455e53d49bff88c 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -4,16 +4,12 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 

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

 class WXDLLEXPORT wxKeyEvent;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxKeyEvent;
 
 // ----------------------------------------------------------------------------


@@ -27,18 +23,15 @@ public:
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
     virtual ~wxAcceleratorTable();
 

-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        : wxObject()
-        { Ref(accel); }
-    wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
-      { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }
-
+#if WXWIN_COMPATIBILITY_2_4

     bool operator==(const wxAcceleratorTable& accel) const
     bool operator==(const wxAcceleratorTable& accel) const

-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
+        { return m_refData == accel.m_refData; }

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

+#endif

 
 

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

 
     void Add(const wxAcceleratorEntry& entry);
     void Remove(const wxAcceleratorEntry& entry);
 
     void Add(const wxAcceleratorEntry& entry);
     void Remove(const wxAcceleratorEntry& entry);