do not add files in wxDebugReport::AddFile if copy failed

[wxWidgets.git] / src / cocoa / menuitem.mm

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index 5a12767e064c530428b2ea495fb92cf2ec383d47..1ddcbb4b614636dc771243d5e0291ee761b629a8 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/cocoa/menuitem.mm

 // Purpose:     wxMenuItem implementation
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxMenuItem implementation
 // Author:      David Elliott
 // Modified by:


@@ -18,15 +18,20 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
 // ----------------------------------------------------------------------------
 
 #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"
 #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/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"
 
 #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
 #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
 
 // ----------------------------------------------------------------------------
 // functions prototypes


@@ -51,6 +55,7 @@
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget

+WX_DECLARE_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)

 
 @implementation wxNSMenuItemTarget : NSObject
 
 
 @implementation wxNSMenuItemTarget : NSObject
 


@@ -72,6 +77,7 @@
 }
 
 @end //implementation wxNSMenuItemTarget
 }
 
 @end //implementation wxNSMenuItemTarget

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)

 
 // ============================================================================
 // wxMenuItemCocoa implementation
 
 // ============================================================================
 // wxMenuItemCocoa implementation


@@ -79,7 +85,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 

-wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[wxNSMenuItemTarget alloc] init];
+wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init];

 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase


@@ -95,10 +101,42 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
     return new wxMenuItem(parentMenu, itemid, name, help, kind, subMenu);
 }
 
     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];
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -134,6 +172,7 @@ wxMenuItemCocoa::wxMenuItemCocoa(wxMenu *pParentMenu,
         else
             [m_cocoaNSMenuItem setTarget: sm_cocoaTarget];
         [menuTitle release];
         else
             [m_cocoaNSMenuItem setTarget: sm_cocoaTarget];
         [menuTitle release];

+        CocoaSetKeyEquivalent();

     }
 }
 
     }
 }
 


@@ -240,11 +279,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))];
     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)
 }
 
 void wxMenuItem::SetCheckable(bool checkable)