Commented out wxAutoNSAutoreleasePool in CallOnInit()

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

diff --git a/include/wx/menu.h b/include/wx/menu.h
index fe2642cdcd9d41dd846b5cc45e1f110278796154..5fe2232e8fecfa7266b98149b1118db1b0187667 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
@@ -242,6 +229,9 @@ public:
     virtual int FindItem(const wxString& item) const;
     wxMenuItem* FindItem(int itemid, wxMenu **menu = NULL) const;
 
+    // find by position
+    wxMenuItem* FindItemByPosition(size_t position) const;
+
     // get/set items attributes
     void Enable(int itemid, bool enable);
     bool IsEnabled(int itemid) const;
@@ -350,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
     // ---------------------------------------
@@ -539,6 +521,8 @@ protected:
     #include "wx/gtk/menu.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menu.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)
     #include "wx/os2/menu.h"
 #endif