Replace wxControlContainer-related macros with wxNavigationEnabled<>.

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index ee7dc5dc321ac83ecc60b766005e3b02cbac02a1..6a64252a6fdb68ba272891f3e5ef13f5c92cb491 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -12,11 +12,13 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

+class WXDLLIMPEXP_FWD_CORE wxWindow;
+

 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAcceleratorTable : public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject

 {
 public:
     // default ctor
 {
 public:
     // default ctor


@@ -28,11 +30,8 @@ public:
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 

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

     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;