Add GetSelectedBitmap methods

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

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 5bcdf830996df4dc5686c3649f1aaac7f2fcf109..04ca07ed559f40248a9df696370804a37b45d140 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 

-class WXDLLEXPORT wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;

 
 // ----------------------------------------------------------------------------
 // wxAcceleratorTable
 
 // ----------------------------------------------------------------------------
 // wxAcceleratorTable


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

-#if WXWIN_COMPATIBILITY_2_4
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; }
-    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);