// ----------------------
#include <string.h>
-@class wxNSMenuItem;
-
-@interface wxNSMenu : NSMenu
-{
- wxMenuImpl* impl;
-}
-
-- (void) setImplementation:(wxMenuImpl*) item;
-- (wxMenuImpl*) implementation;
-
-@end
-
@implementation wxNSMenu
- (id) init
{
[super init];
+ impl = NULL;
return self;
}
if ( menuimpl )
{
wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
- wxpeer->HandleMenuOpened();
+ if ( wxpeer )
+ wxpeer->HandleMenuOpened();
}
}
if ( menuimpl )
{
wxMenu* wxpeer = (wxMenu*) menuimpl->GetWXPeer();
- wxpeer->HandleMenuClosed();
+ if ( wxpeer )
+ wxpeer->HandleMenuClosed();
}
}
@end
+@interface NSApplication(MissingAppleMenuCall)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+
class wxMenuCocoaImpl : public wxMenuImpl
{
public :
- wxMenuCocoaImpl( wxMenu* peer , NSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
+ wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
{
+ static wxNSMenuController* controller = NULL;
+ if ( controller == NULL )
+ {
+ controller = [[wxNSMenuController alloc] init];
+ }
+ [menu setDelegate:controller];
+ [m_osxMenu setImplementation:this];
}
virtual ~wxMenuCocoaImpl();
[m_osxMenu setTitle:cfText.AsNSString()];
}
+ virtual void PopUp( wxWindow *win, int x, int y )
+ {
+ win->ScreenToClient( &x , &y ) ;
+ NSView *view = win->GetPeer()->GetWXWidget();
+ NSRect frame = [view frame];
+ frame.origin.x = x;
+ frame.origin.y = y;
+ frame.size.width = 1;
+ frame.size.height = 1;
+ NSPopUpButtonCell *popUpButtonCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
+ [popUpButtonCell setAutoenablesItems:NO];
+ [popUpButtonCell setAltersStateOfSelectedItem:NO];
+ [popUpButtonCell setMenu:m_osxMenu];
+ [popUpButtonCell selectItem:nil];
+ [popUpButtonCell performClickWithFrame:frame inView:view];
+ [popUpButtonCell release];
+ }
+
WXHMENU GetHMenu() { return m_osxMenu; }
static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
static wxMenuImpl* CreateRootMenu( wxMenu* peer );
protected :
- NSMenu* m_osxMenu;
+ wxNSMenu* m_osxMenu;
} ;
wxMenuCocoaImpl::~wxMenuCocoaImpl()
{
+ [m_osxMenu setDelegate:nil];
+ [m_osxMenu setImplementation:nil];
[m_osxMenu release];
}
wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
{
- static wxNSMenuController* controller = NULL;
- if ( controller == NULL )
- {
- controller = [[wxNSMenuController alloc] init];
- }
wxCFStringRef cfText( title );
wxNSMenu* menu = [[wxNSMenu alloc] initWithTitle:cfText.AsNSString()];
wxMenuImpl* c = new wxMenuCocoaImpl( peer, menu );
- [menu setDelegate:controller];
- [menu setImplementation:c];
return c;
}