fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 22227936763e9abce033eb198a0305edb73c4373..628f38ecfb2db1035492e8921ceb2144b4159c0f 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -34,23 +34,12 @@
 // ----------------------
 #include <string.h>
 
 // ----------------------
 #include <string.h>
 

-@class wxNSMenuItem;
-
-@interface wxNSMenu : NSMenu
-{
-   wxMenuImpl* impl;
-}
-
-- (void) setImplementation:(wxMenuImpl*) item;
-- (wxMenuImpl*) implementation;
-
-@end 
-

 @implementation wxNSMenu
 
 - (id) init
 {
     [super init];
 @implementation wxNSMenu
 
 - (id) init
 {
     [super init];

+    impl = NULL;

     return self;
 }
 
     return self;
 }
 


@@ -91,7 +80,8 @@
     if ( menuimpl )
     {
         wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
     if ( menuimpl )
     {
         wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();

-        wxpeer->HandleMenuOpened();
+        if ( wxpeer )
+            wxpeer->HandleMenuOpened();

     }
 }
 
     }
 }
 


@@ -102,7 +92,8 @@
     if ( menuimpl )
     {
         wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
     if ( menuimpl )
     {
         wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();

-        wxpeer->HandleMenuClosed();
+        if ( wxpeer )
+            wxpeer->HandleMenuClosed();

     }
 }
 
     }
 }
 


@@ -126,11 +117,22 @@
 
 @end
 
 
 @end
 

+@interface NSApplication(MissingAppleMenuCall) 
+- (void)setAppleMenu:(NSMenu *)menu; 
+@end 
+

 class wxMenuCocoaImpl : public wxMenuImpl 
 {
 public :
 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();
     }
     
     virtual ~wxMenuCocoaImpl();


@@ -187,25 +189,20 @@ public :
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :

-    NSMenu* m_osxMenu;
+    wxNSMenu* m_osxMenu;

 } ;
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {
 } ;
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {

+    [m_osxMenu setDelegate:nil];
+    [m_osxMenu setImplementation:nil];

     [m_osxMenu release];
 }
 
 wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
 {
     [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 );
     wxCFStringRef cfText( title );
     wxNSMenu* menu = [[wxNSMenu alloc] initWithTitle:cfText.AsNSString()];
     wxMenuImpl* c = new wxMenuCocoaImpl( peer, menu );

-    [menu setDelegate:controller];
-    [menu setImplementation:c];

     return c;
 }
     return c;
 }