applied patch fixing problems with X server crash when using wxGLCanvas with nVidia...

[wxWidgets.git] / include / wx / cocoa / menuitem.h

diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h
index b312bc7489b1589d8820be5a601787e9850d79da..d5ba585ac620a5422cd0fbf56d39c52d402ddaf9 100644 (file)
--- a/include/wx/cocoa/menuitem.h
+++ b/include/wx/cocoa/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/13
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_MENUITEM_H_
@@ -15,6 +15,8 @@
 #include "wx/hashmap.h"
 #include "wx/bitmap.h"
 
+#include "wx/cocoa/ObjcRef.h"
+
 // ========================================================================
 // wxMenuItem
 // ========================================================================
@@ -49,10 +51,13 @@ public:
             return iter->second;
         return NULL;
     }
+    void CocoaItemSelected();
+    bool Cocoa_validateMenuItem();
 protected:
+    void CocoaSetKeyEquivalent();
     WX_NSMenuItem m_cocoaNSMenuItem;
     static wxMenuItemCocoaHash sm_cocoaHash;
-    static struct objc_object *sm_cocoaTarget;
+    static wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaTarget;
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------