X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/cocoa/menuitem.mm

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index ac1893384a..b5d1daa220 100644
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/cocoa/menuitem.mm
 // Purpose:     wxMenuItem implementation
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/15
-// RCS-ID:      $Id: 
-// Copyright:   2002 David Elliott
-// Licence:     wxWidgets licence
+// RCS-ID:      $Id$
+// Copyright:   2002-2004 David Elliott
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -18,15 +18,20 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
+
+#if wxUSE_MENUS
+
+#include "wx/menuitem.h"
+
+#include "wx/cocoa/objc/objc_uniquifying.h"
+
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
-    #include "wx/menuitem.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
@@ -34,8 +39,7 @@
 #import <AppKit/NSMenu.h>
 #import <Foundation/NSString.h>
 #import <AppKit/NSCell.h> // NSOnState, NSOffState
-
-#if wxUSE_MENUS
+#import <AppKit/NSEvent.h> // modifier key masks
 
 // ----------------------------------------------------------------------------
 // functions prototypes
@@ -51,6 +55,7 @@
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)
 
 @implementation wxNSMenuItemTarget : NSObject
 
@@ -59,16 +64,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,32 +73,18 @@
     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
-
-// ============================================================================
-// @class wxPoserNSMenuItem
-// ============================================================================
-@interface wxPoserNSMenuItem : NSMenuItem
-{
-}
-
-@end // wxPoserNSMenuItem
-
-WX_IMPLEMENT_POSER(wxPoserNSMenuItem);
-@implementation wxPoserNSMenuItem : NSMenuItem
-
-@end // wxPoseRNSMenuItem
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)
 
 // ============================================================================
 // wxMenuItemCocoa implementation
 // ============================================================================
-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 = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init];
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
@@ -118,10 +100,42 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
     return new wxMenuItem(parentMenu, itemid, name, help, kind, subMenu);
 }
 
-/* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+void wxMenuItemCocoa::CocoaSetKeyEquivalent()
 {
-    return wxStripMenuCodes(text);
+    wxAcceleratorEntry *accel = GetAccel();
+    if(!accel)
+        return;
+
+    int accelFlags = accel->GetFlags();
+    int keyModifierMask = 0;
+    if(accelFlags & wxACCEL_ALT)
+        keyModifierMask |= NSAlternateKeyMask;
+    if(accelFlags & wxACCEL_CTRL)
+        keyModifierMask |= NSCommandKeyMask;
+    int keyCode = accel->GetKeyCode();
+    if(isalpha(keyCode))
+    {   // For alpha characters use upper/lower rather than NSShiftKeyMask
+        char alphaChar;
+        if(accelFlags & wxACCEL_SHIFT)
+            alphaChar = toupper(keyCode);
+        else
+            alphaChar = tolower(keyCode);
+        [m_cocoaNSMenuItem setKeyEquivalent:[NSString stringWithCString:&alphaChar length:1]];
+        [m_cocoaNSMenuItem setKeyEquivalentModifierMask:keyModifierMask];
+    }
+    else
+    {
+        if(accelFlags & wxACCEL_SHIFT)
+            keyModifierMask |= NSShiftKeyMask;
+        if(keyCode < 128) // low ASCII includes backspace/tab/etc.
+        {   char alphaChar = keyCode;
+            [m_cocoaNSMenuItem setKeyEquivalent:[NSString stringWithCString:&alphaChar length:1]];
+        }
+        else
+        {   // TODO
+        }
+        [m_cocoaNSMenuItem setKeyEquivalentModifierMask:keyModifierMask];
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -141,16 +155,23 @@ 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];
+        CocoaSetKeyEquivalent();
     }
 }
 
@@ -160,6 +181,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
 // ----------------------------------------------------------------------------
@@ -178,7 +225,7 @@ void wxMenuItem::SetBitmaps(const wxBitmap& bmpChecked,
     }
     else
     {
-        wxASSERT_MSG(!bmpUnchecked.Ok(),wxT("Normal menu items should only have one bitmap"));
+        wxASSERT_MSG(!bmpUnchecked.IsOk(),wxT("Normal menu items should only have one bitmap"));
         [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)];
     }
 }
@@ -231,11 +278,12 @@ void wxMenuItem::Check(bool check)
     }
 }
 
-void wxMenuItem::SetText(const wxString& label)
+void wxMenuItem::SetItemLabel(const wxString& label)
 {
-    wxMenuItemBase::SetText(label);
+    wxMenuItemBase::SetItemLabel(label);
     wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have titles."));
     [m_cocoaNSMenuItem setTitle: wxNSStringWithWxString(wxStripMenuCodes(label))];
+    CocoaSetKeyEquivalent();
 }
 
 void wxMenuItem::SetCheckable(bool checkable)