X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd582574c2b98f7ba8049821a1241516396daecf..8ec1974ea170256698381cc47dd1dcd6cb494433:/include/wx/menu.h

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 77633a7814..5fe2232e8f 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -16,6 +16,8 @@
     #pragma interface "menubase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
@@ -38,21 +40,6 @@ class WXDLLEXPORT wxMenuItem;
 WX_DECLARE_EXPORTED_LIST(wxMenu, wxMenuList);
 WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList);
 
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-// having callbacks in menus is a wxWin 1.6x feature which should be replaced
-// with event tables in wxWin 2.xx code - however provide it because many
-// people like it a lot by default
-#ifndef wxUSE_MENU_CALLBACK
-    #if WXWIN_COMPATIBILITY_2
-        #define wxUSE_MENU_CALLBACK 1
-    #else
-        #define wxUSE_MENU_CALLBACK 0
-    #endif // WXWIN_COMPATIBILITY_2
-#endif // !defined(wxUSE_MENU_CALLBACK)
-
 // ----------------------------------------------------------------------------
 // wxMenu
 // ----------------------------------------------------------------------------
@@ -353,14 +340,6 @@ public:
     wxList& GetItems() const { return (wxList &)m_items; }
 #endif // WXWIN_COMPATIBILITY
 
-#if wxUSE_MENU_CALLBACK || defined(__WXMOTIF__)
-    // wxWin 1.6x compatible menu event handling
-    wxFunction GetCallback() const { return m_callback; }
-    void Callback(const wxFunction func) { m_callback = func; }
-
-    wxFunction m_callback;
-#endif // wxUSE_MENU_CALLBACK
-
 protected:
     // virtuals to override in derived classes
     // ---------------------------------------