From d04995b3a6d56d610d0eb7af9c07ba91eaf4884d Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Fri, 15 Oct 2004 01:39:35 +0000
Subject: [PATCH] Use wxObjcAutoRefFromAlloc for sm_cocoaTarget. Move some
 processing code from wxMenuItemAction to CocoaItemSelected. Add
 Cocoa_validateMenuItem and use it instead of calling IsEnabled directly. Do
 not set the target or action for wxMenuItem that open submenus.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/cocoa/menuitem.h |  6 ++++-
 src/cocoa/menuitem.mm       | 51 +++++++++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/include/wx/cocoa/menuitem.h b/include/wx/cocoa/menuitem.h
index 75e66b1d4c..3596f68cc0 100644
--- a/include/wx/cocoa/menuitem.h
+++ b/include/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,12 @@ public:
             return iter->second;
         return NULL;
     }
+    void CocoaItemSelected();
+    bool Cocoa_validateMenuItem();
 protected:
     WX_NSMenuItem m_cocoaNSMenuItem;
     static wxMenuItemCocoaHash sm_cocoaHash;
-    static struct objc_object *sm_cocoaTarget;
+    static wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaTarget;
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index 595ce11730..5a12767e06 100644
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -59,16 +59,7 @@
     wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
     wxMenuItem *item = wxMenuItem::GetFromCocoa(sender);
     wxCHECK_RET(item,wxT("wxMenuItemAction received but no wxMenuItem exists!"));
-
-    wxMenu *menu = item->GetMenu();
-    wxCHECK_RET(menu,wxT("wxMenuItemAction received but wxMenuItem is not in a wxMenu"));
-    wxMenuBar *menubar = menu->GetMenuBar();
-    if(menubar)
-    {
-        wxFrame *frame = menubar->GetFrame();
-        wxCHECK_RET(frame, wxT("wxMenuBar MUST be attached to a wxFrame!"));
-        frame->ProcessCommand(item->GetId());
-    }
+    item->CocoaItemSelected();
 }
 
 - (BOOL)validateMenuItem: (id)menuItem
@@ -77,7 +68,7 @@
     wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
     wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
     wxCHECK_MSG(item,NO,wxT("validateMenuItem received but no wxMenuItem exists!"));
-    return item->IsEnabled();
+    return item->Cocoa_validateMenuItem();
 }
 
 @end //implementation wxNSMenuItemTarget
@@ -88,7 +79,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
-struct objc_object *wxMenuItemCocoa::sm_cocoaTarget = [[wxNSMenuItemTarget alloc] init];
+wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[wxNSMenuItemTarget alloc] init];
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
@@ -127,15 +118,21 @@ wxMenuItemCocoa::wxMenuItemCocoa(wxMenu *pParentMenu,
     else
     {
         NSString *menuTitle = wxInitNSStringWithWxString([NSString alloc],wxStripMenuCodes(strName));
-        m_cocoaNSMenuItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:@selector(wxMenuItemAction:) keyEquivalent:@""];
+        SEL action;
+        if(pSubMenu)
+            action = nil;
+        else
+            action = @selector(wxMenuItemAction:);
+        m_cocoaNSMenuItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:action keyEquivalent:@""];
         sm_cocoaHash.insert(wxMenuItemCocoaHash::value_type(m_cocoaNSMenuItem,this));
-        [m_cocoaNSMenuItem setTarget:sm_cocoaTarget];
         if(pSubMenu)
         {
             wxASSERT(pSubMenu->GetNSMenu());
             [pSubMenu->GetNSMenu() setTitle:menuTitle];
             [m_cocoaNSMenuItem setSubmenu:pSubMenu->GetNSMenu()];
         }
+        else
+            [m_cocoaNSMenuItem setTarget: sm_cocoaTarget];
         [menuTitle release];
     }
 }
@@ -146,6 +143,32 @@ wxMenuItem::~wxMenuItem()
     [m_cocoaNSMenuItem release];
 }
 
+void wxMenuItem::CocoaItemSelected()
+{
+    wxMenu *menu = GetMenu();
+    wxCHECK_RET(menu,wxT("wxMenuItemAction received but wxMenuItem is not in a wxMenu"));
+    wxMenuBar *menubar = menu->GetMenuBar();
+    if(menubar)
+    {
+        wxFrame *frame = menubar->GetFrame();
+        wxCHECK_RET(frame, wxT("wxMenuBar MUST be attached to a wxFrame!"));
+        frame->ProcessCommand(GetId());
+    }
+    else
+    {
+        if(IsCheckable())
+            Toggle();
+        GetMenu()->SendEvent(GetId(), IsCheckable()?IsChecked():-1);
+    }
+}
+
+bool wxMenuItem::Cocoa_validateMenuItem()
+{
+    // TODO: do more sanity checking
+    // TODO: Do wxWindows validation here and avoid sending during idle time
+    return IsEnabled();
+}
+
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
-- 
2.45.2