Fail in CloneGDIRefData() instead of implementing it incorrectly in wxOSX.

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

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index cb525c3fac272b83148a2a3f17f8f0eeb123235d..c253f75672c9d77b55d47cfe79e85b37bd46491f 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -35,7 +35,10 @@
     wxUnusedVar(sender);
     if ( impl )
     {
     wxUnusedVar(sender);
     if ( impl )
     {

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

      }
 }
 
      }
 }
 


@@ -68,7 +71,7 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
     int key = entry->GetKeyCode() ;
     if ( key )
     {
     int key = entry->GetKeyCode() ;
     if ( key )
     {

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

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


@@ -212,6 +215,8 @@ public :
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }

+    
+    bool DoDefault();

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


@@ -226,6 +231,29 @@ wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
     [m_osxMenuItem release];
 }
 
     [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,
                        int WXUNUSED(id),
 
 wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
                        int WXUNUSED(id),