// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: menu.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
-#include "wx/menu.h"
-
#ifndef WX_PRECOMP
- #include "wx/log.h"
- #include "wx/app.h"
- #include "wx/utils.h"
- #include "wx/frame.h"
- #include "wx/menuitem.h"
+#include "wx/log.h"
+#include "wx/app.h"
+#include "wx/utils.h"
+#include "wx/frame.h"
+#include "wx/menuitem.h"
#endif
+#include "wx/menu.h"
+
#include "wx/osx/private.h"
// other standard headers
@implementation wxNSMenu
-- (id) init
+- (id) initWithTitle:(NSString*) title
{
- [super init];
+ self = [super initWithTitle:title];
impl = NULL;
return self;
}
@end
+// this is more compatible, as it is also called for command-key shortcuts
+// and under 10.4, we are not getting a 'close' event however...
+#define wxOSX_USE_NEEDSUPDATE_HOOK 1
+
@interface wxNSMenuController : NSObject wxOSX_10_6_AND_LATER(<NSMenuDelegate>)
{
}
+#if wxOSX_USE_NEEDSUPDATE_HOOK
+- (void)menuNeedsUpdate:(NSMenu*)smenu;
+#else
- (void)menuWillOpen:(NSMenu *)menu;
+#endif
- (void)menuDidClose:(NSMenu *)menu;
- (void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item;
- (id) init
{
- [super init];
+ self = [super init];
return self;
}
+#if wxOSX_USE_NEEDSUPDATE_HOOK
+- (void)menuNeedsUpdate:(NSMenu*)smenu
+{
+ wxNSMenu* menu = (wxNSMenu*) smenu;
+ wxMenuImpl* menuimpl = [menu implementation];
+ if ( menuimpl )
+ {
+ wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
+ if ( wxpeer )
+ wxpeer->HandleMenuOpened();
+ }
+}
+#else
- (void)menuWillOpen:(NSMenu *)smenu
{
wxNSMenu* menu = (wxNSMenu*) smenu;
wxpeer->HandleMenuOpened();
}
}
+#endif
- (void)menuDidClose:(NSMenu *)smenu
{
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
{
+ NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
+ // make sure a call of SetSubMenu is also reflected (occurring after Create)
+ // update the native menu item accordingly
+
+ if ( pItem->IsSubMenu() )
+ {
+ wxMenu* wxsubmenu = pItem->GetSubMenu();
+ WXHMENU nssubmenu = wxsubmenu->GetHMenu();
+ if ( [nsmenuitem submenu] != nssubmenu )
+ {
+ wxsubmenu->GetPeer()->SetTitle( pItem->GetItemLabelText() );
+ [nsmenuitem setSubmenu:nssubmenu];
+ }
+ }
+
if ( pos == (size_t) -1 )
- [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
+ [m_osxMenu addItem:nsmenuitem ];
else
- [m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
+ [m_osxMenu insertItem:nsmenuitem atIndex:pos];
}
virtual void Remove( wxMenuItem *pItem )