no changes, just removed apparently unneeded wxMacBitmapButton class

[wxWidgets.git] / src / osx / cocoa / menu.mm

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 09a753f6b56e7af3c143bb1977850ce26b7e639b..cce72f426058e058f3dd2373e10612427d4aae25 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -34,23 +34,12 @@
 // ----------------------
 #include <string.h>
 
-@class wxNSMenuItem;
-
-@interface wxNSMenu : NSMenu
-{
-   wxMenuImpl* impl;
-}
-
-- (void) setImplementation:(wxMenuImpl*) item;
-- (wxMenuImpl*) implementation;
-
-@end 
-
 @implementation wxNSMenu
 
 - (id) init
 {
     [super init];
+    impl = NULL;
     return self;
 }
 
@@ -128,11 +117,22 @@
 
 @end
 
+@interface NSApplication(MissingAppleMenuCall) 
+- (void)setAppleMenu:(NSMenu *)menu; 
+@end 
+
 class wxMenuCocoaImpl : public wxMenuImpl 
 {
 public :
-    wxMenuCocoaImpl( wxMenu* peer , NSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
+    wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
     {
+        static wxNSMenuController* controller = NULL;
+        if ( controller == NULL )
+        {
+            controller = [[wxNSMenuController alloc] init];
+        }
+        [menu setDelegate:controller];
+        [m_osxMenu setImplementation:this];
     }
     
     virtual ~wxMenuCocoaImpl();
@@ -156,7 +156,7 @@ public :
         [NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]];
     }
 
-    virtual void Enable( bool enable )
+    virtual void Enable( bool WXUNUSED(enable) )
     {
     }
     
@@ -189,25 +189,20 @@ public :
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
-    NSMenu* m_osxMenu;
+    wxNSMenu* m_osxMenu;
 } ;
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {
+    [m_osxMenu setDelegate:nil];
+    [m_osxMenu setImplementation:nil];
     [m_osxMenu release];
 }
 
 wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
 {
-    static wxNSMenuController* controller = NULL;
-    if ( controller == NULL )
-    {
-        controller = [[wxNSMenuController alloc] init];
-    }
     wxCFStringRef cfText( title );
     wxNSMenu* menu = [[wxNSMenu alloc] initWithTitle:cfText.AsNSString()];
     wxMenuImpl* c = new wxMenuCocoaImpl( peer, menu );
-    [menu setDelegate:controller];
-    [menu setImplementation:c];
     return c;
 }