fixing class

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

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index 87132b46000e6d5d7f5b4816f504ccf88785a6de..0c6c930e32d91c516851e6c8ad00452e127c3b3d 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: menuitem.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -16,46 +16,99 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
 
     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
 

-@interface wxNSMenuItem : NSMenuItem
+// a mapping from wx ids to standard osx actions in order to support the native menu item handling
+// if a new mapping is added, make sure the wxNonOwnedWindowController has a handler for this action as well
+
+struct Mapping

 {
 {

-   wxMenuItemImpl* impl;
-}
+    int menuid;
+    SEL action;
+};

 
 

-- (void) setImplementation:(wxMenuItemImpl*) item;
-- (wxMenuItemImpl*) implementation;
+Mapping sActionToWXMapping[] =
+{
+// as we don't have NSUndoManager support we must not use the native actions
+#if 0
+    { wxID_UNDO, @selector(undo:) },
+    { wxID_REDO, @selector(redo:) },
+#endif
+    { wxID_CUT, @selector(cut:) },
+    { wxID_COPY, @selector(copy:) },
+    { wxID_PASTE, @selector(paste:) },
+    { wxID_CLEAR, @selector(delete:) },
+    { wxID_SELECTALL, @selector(selectAll:) },
+    { 0, NULL }
+};
+
+int wxOSXGetIdFromSelector(SEL action )
+{
+    int i = 0 ;
+    while ( sActionToWXMapping[i].action != nil )
+    {
+        if ( sActionToWXMapping[i].action == action )
+            return sActionToWXMapping[i].menuid;
+        ++i;
+    }
+    
+    return 0;
+}

 
 

-- (void) clickedAction: (id) sender;
-- (BOOL)validateMenuItem:(NSMenuItem *) menuItem;
+SEL wxOSXGetSelectorFromID(int menuId )
+{
+    int i = 0 ;
+    while ( sActionToWXMapping[i].action != nil )
+    {
+        if ( sActionToWXMapping[i].menuid == menuId )
+            return sActionToWXMapping[i].action;
+        ++i;
+    }
+    
+    return nil;
+}

 
 

-@end 

 
 @implementation wxNSMenuItem
 
 
 @implementation wxNSMenuItem
 

-- (id) init
+- (id) initWithTitle:(NSString *)aString action:(SEL)aSelector keyEquivalent:(NSString *)charCode

 {
 {

-    [super init];
-     return self;
+    self = [super initWithTitle:aString action:aSelector keyEquivalent:charCode];
+    return self;

 }
 
 - (void) clickedAction: (id) sender
 {
 }
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     if ( impl )
     {
     if ( impl )
     {

-        impl->GetWXPeer()->GetMenu()->HandleCommandProcess(impl->GetWXPeer());
+        wxMenuItem* menuitem = impl->GetWXPeer();
+        if ( menuitem->GetMenu()->HandleCommandProcess(menuitem) == false )
+        {
+        }

      }
 }
 
      }
 }
 

+- (void) setEnabled:(BOOL) flag
+{
+    [super setEnabled:flag];
+}
+

 - (BOOL)validateMenuItem:(NSMenuItem *) menuItem
 {
 - (BOOL)validateMenuItem:(NSMenuItem *) menuItem
 {

+    wxUnusedVar(menuItem);

     if( impl )
     {
     if( impl )
     {

-        impl->GetWXPeer()->GetMenu()->HandleCommandUpdateStatus(impl->GetWXPeer());
-        return impl->GetWXPeer()->IsEnabled();
+        wxMenuItem* wxmenuitem = impl->GetWXPeer();
+        if ( wxmenuitem )
+        {
+            wxmenuitem->GetMenu()->HandleCommandUpdateStatus(wxmenuitem);
+            return wxmenuitem->IsEnabled();
+        }

     }
     return YES ;
 }
     }
     return YES ;
 }


@@ -74,13 +127,22 @@
 
 void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry* entry )
 {
 
 void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry* entry )
 {

+    if ( entry == NULL )
+    {
+        [menuItem setKeyEquivalent:@""];
+        return;
+    }
+         

     unsigned int modifiers = 0 ;
     int key = entry->GetKeyCode() ;
     if ( key )
     {
     unsigned int modifiers = 0 ;
     int key = entry->GetKeyCode() ;
     if ( key )
     {

-        if (entry->GetFlags() & wxACCEL_CTRL);
+        if (entry->GetFlags() & wxACCEL_CTRL)

             modifiers |= NSCommandKeyMask;
 
             modifiers |= NSCommandKeyMask;
 

+        if (entry->GetFlags() & wxACCEL_RAW_CTRL)
+            modifiers |= NSControlKeyMask;
+        

         if (entry->GetFlags() & wxACCEL_ALT)
             modifiers |= NSAlternateKeyMask ;
 
         if (entry->GetFlags() & wxACCEL_ALT)
             modifiers |= NSAlternateKeyMask ;
 


@@ -99,71 +161,59 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
         {
             switch ( key )
             {
         {
             switch ( key )
             {

-/*
-                // standard function keys from here
-                case WXK_TAB :
-                    modifiers |= NSFunctionKeyMask ;
-                    shortcut = NSTabCharacter ;
-                    break ;
-
-                case kEnterCharCode :
-                    modifiers |= NSFunctionKeyMask ;
-                    cocoaKey = NSTabCharacter ;
-                    break ;
-
-                case WXK_RETURN :
-                    modifiers |= NSFunctionKeyMask ;
-                    cocoaKey = NSTabCharacter ;
-                    break ;
-
-                case WXK_ESCAPE :
-                    modifiers |= NSFunctionKeyMask ;
-                    cocoaKey = kEscapeCharCode ;
-                    break ;
-
-                case WXK_SPACE :
-                    shortcut = ' ' ;
-                    break ;
-
-

                 case WXK_CLEAR :
                 case WXK_CLEAR :

-                    cocoaKey = kClearCharCode ;
+                    modifiers |= NSFunctionKeyMask;
+                    shortcut = NSDeleteCharacter ;

                     break ;
 
                 case WXK_PAGEUP :
                     break ;
 
                 case WXK_PAGEUP :

-                    cocoaKey = kPageUpCharCode ;
+                    modifiers |= NSFunctionKeyMask;
+                    shortcut = NSPageUpFunctionKey ;

                     break ;
 
                 case WXK_PAGEDOWN :
                     break ;
 
                 case WXK_PAGEDOWN :

-                    cocoaKey = kPageDownCharCode ;
+                    modifiers |= NSFunctionKeyMask;
+                    shortcut = NSPageDownFunctionKey ;

                     break ;
 
                 case WXK_LEFT :
                     break ;
 
                 case WXK_LEFT :

-                    cocoaKey = kLeftArrowCharCode ;
+                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
+                    shortcut = NSLeftArrowFunctionKey ;

                     break ;
 
                 case WXK_UP :
                     break ;
 
                 case WXK_UP :

-                    cocoaKey = kUpArrowCharCode ;
+                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
+                    shortcut = NSUpArrowFunctionKey ;

                     break ;
 
                 case WXK_RIGHT :
                     break ;
 
                 case WXK_RIGHT :

-                    cocoaKey = kRightArrowCharCode ;
+                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
+                    shortcut = NSRightArrowFunctionKey ;

                     break ;
 
                 case WXK_DOWN :
                     break ;
 
                 case WXK_DOWN :

-                    cocoaKey = kDownArrowCharCode ;
+                    modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
+                    shortcut = NSDownArrowFunctionKey ;

                     break ;
 
                 case WXK_HOME :
                     break ;
 
                 case WXK_HOME :

-                    cocoaKey = kHomeCharCode ;
+                    modifiers |= NSFunctionKeyMask;
+                    shortcut = NSHomeFunctionKey ;

                     break ;
 
                 case WXK_END :
                     break ;
 
                 case WXK_END :

-                    cocoaKey = kEndCharCode ;
+                    modifiers |= NSFunctionKeyMask;
+                    shortcut = NSEndFunctionKey ;

                     break ;
                     break ;

-*/
-                // TODO Test all above with their function key equiv.
-                // from NSEvent.h
+
+                case WXK_NUMPAD_ENTER :
+                    shortcut = NSEnterCharacter;
+                    break;
+                    
+                case WXK_BACK :
+                case WXK_RETURN :
+                case WXK_TAB :
+                case WXK_ESCAPE :

                 default :
                     if(entry->GetFlags() & wxACCEL_SHIFT)
                         shortcut = toupper(key);
                 default :
                     if(entry->GetFlags() & wxACCEL_SHIFT)
                         shortcut = toupper(key);


@@ -178,45 +228,55 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
     }
 }
 
     }
 }
 

-class wxMenuItemCocoaImpl : public wxMenuItemImpl 
+@interface NSMenuItem(PossibleMethods)
+- (void)setHidden:(BOOL)hidden;
+@end
+
+class wxMenuItemCocoaImpl : public wxMenuItemImpl

 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {
 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {

+        if ( ![m_osxMenuItem isSeparatorItem] )
+            [(wxNSMenuItem*)m_osxMenuItem setImplementation:this];

     }
     }

-    
+

     ~wxMenuItemCocoaImpl();
     ~wxMenuItemCocoaImpl();

-        
-    void SetBitmap( const wxBitmap& bitmap ) 
+
+    void SetBitmap( const wxBitmap& bitmap )

     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }
     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }

-    
-    void Enable( bool enable ) 
+
+    void Enable( bool enable )

     {
         [m_osxMenuItem setEnabled:enable];
     }
     {
         [m_osxMenuItem setEnabled:enable];
     }

-    
-    void Check( bool check ) 
+
+    void Check( bool check )

     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }
     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }

-    
+

     void Hide( bool hide )
     {
     void Hide( bool hide )
     {

-        [m_osxMenuItem setHidden:hide ];
+        // NB: setHidden is new as of 10.5 so we should not call it below there
+        if ([m_osxMenuItem respondsToSelector:@selector(setHidden:)])
+            [m_osxMenuItem setHidden:hide ];
+        else
+            wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");

     }
     }

-    
-    void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) 
+
+    void SetLabel( const wxString& text, wxAcceleratorEntry *entry )

     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];
     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];

-        
-        if ( entry )
-            wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );

 
 

+        wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );

     }
     
     }
     

+    bool DoDefault();
+

     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :
     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :


@@ -225,20 +285,46 @@ protected :
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {

+    if ( ![m_osxMenuItem isSeparatorItem] )
+        [(wxNSMenuItem*)m_osxMenuItem setImplementation:nil];
+    [m_osxMenuItem release];

 }
 
 }
 

+bool wxMenuItemCocoaImpl::DoDefault()
+{
+    bool handled=false;
+    int menuid = m_peer->GetId();
+    
+    NSApplication *theNSApplication = [NSApplication sharedApplication];
+    if (menuid == wxID_OSX_HIDE)
+    {
+        [theNSApplication hide:nil];
+        handled=true;
+    }
+    else if (menuid == wxID_OSX_HIDEOTHERS)
+    {
+        [theNSApplication hideOtherApplications:nil];
+        handled=true;
+    }
+    else if (menuid == wxID_OSX_SHOWALL)
+    {
+        [theNSApplication unhideAllApplications:nil];
+        handled=true;
+    }
+    return handled;
+}

 
 wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
 
 wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,

-                       int id,
+                       int menuid,

                        const wxString& text,
                        wxAcceleratorEntry *entry,
                        const wxString& text,
                        wxAcceleratorEntry *entry,

-                       const wxString& strHelp,
+                       const wxString& WXUNUSED(strHelp),

                        wxItemKind kind,
                        wxMenu *pSubMenu )
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;
                        wxItemKind kind,
                        wxMenu *pSubMenu )
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;

-    
+

     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];
     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];


@@ -246,29 +332,34 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
     else
     {
         wxCFStringRef cfText(text);
     else
     {
         wxCFStringRef cfText(text);

-        wxNSMenuItem* temp = [ [ wxNSMenuItem alloc ] init ];
-        if ( ! pParentMenu->GetNoEventsMode() )
+        SEL selector = nil;
+        bool targetSelf = false;
+        if ( (pParentMenu == NULL || !pParentMenu->GetNoEventsMode()) && pSubMenu == NULL )

         {
         {

-            [temp setTarget: temp];
-            [temp setAction: @selector(clickedAction:)];
+            selector = wxOSXGetSelectorFromID(menuid);
+            
+            if ( selector == nil )
+            {
+                selector = @selector(clickedAction:);
+                targetSelf = true;
+            }

         }
         }

-        [temp setTitle:cfText.AsNSString()];
+        
+        wxNSMenuItem* menuitem = [ [ wxNSMenuItem alloc ] initWithTitle:cfText.AsNSString() action:selector keyEquivalent:@""];
+        if ( targetSelf )
+            [menuitem setTarget:menuitem];
+        

         if ( pSubMenu )
         {
             pSubMenu->GetPeer()->SetTitle( text );
         if ( pSubMenu )
         {
             pSubMenu->GetPeer()->SetTitle( text );

-            [temp setSubmenu:pSubMenu->GetHMenu()];
+            [menuitem setSubmenu:pSubMenu->GetHMenu()];

         }
         else
         {
         }
         else
         {

-            if ( entry )
-                wxMacCocoaMenuItemSetAccelerator( temp, entry );
+            wxMacCocoaMenuItemSetAccelerator( menuitem, entry );

         }
         }

-        item = temp;
+        item = menuitem;

     }
     c = new wxMenuItemCocoaImpl( peer, item );
     }
     c = new wxMenuItemCocoaImpl( peer, item );

-    if ( kind != wxITEM_SEPARATOR )
-    {
-        [(wxNSMenuItem*)item setImplementation:c];
-    }

     return c;
 }
     return c;
 }