A few tweaks and cleanups

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index 78595ea427a17de72a33c50152cd804be73861cc..986ea9b66df7be570ad692bc1d76cf3a075e0ccb 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -75,9 +75,9 @@ public:
     bool operator!=(const wxAcceleratorEntry& entry) const
         { return !(*this == entry); }
 
     bool operator!=(const wxAcceleratorEntry& entry) const
         { return !(*this == entry); }
 

-#if defined(__WXMOTIF__) || defined(__WXX11__)
+#if defined(__WXMOTIF__)

     // Implementation use only
     // Implementation use only

-    bool MatchesEvent(const wxKeyEvent& event) const ;
+    bool MatchesEvent(const wxKeyEvent& event) const;

 #endif
     
 private:
 #endif
     
 private:


@@ -105,8 +105,6 @@ private:
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"

-#elif defined(__WXX11__)
-    #include "wx/x11/accel.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXPM__)