- (id) init
{
[super init];
+ impl = NULL;
return self;
}
@end
-@interface wxNSMenuController : NSObject
+@interface wxNSMenuController : NSObject
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+ <NSMenuDelegate>
+#endif
{
}
@end
-@interface NSApplication(MissingAppleMenuCall)
-- (void)setAppleMenu:(NSMenu *)menu;
-@end
+@interface NSApplication(MissingAppleMenuCall)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
-class wxMenuCocoaImpl : public wxMenuImpl
+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];
+ // gc aware
+ if ( m_osxMenu )
+ CFRetain(m_osxMenu);
+ [m_osxMenu release];
}
-
+
virtual ~wxMenuCocoaImpl();
-
- virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
+
+ virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)
{
if ( pos == (size_t) -1 )
[m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
else
[m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
}
-
- virtual void Remove( wxMenuItem *pItem )
+
+ virtual void Remove( wxMenuItem *pItem )
{
[m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
}
-
+
virtual void MakeRoot()
{
[NSApp setMainMenu:m_osxMenu];
[NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]];
}
- virtual void Enable( bool enable )
+ virtual void Enable( bool WXUNUSED(enable) )
{
}
-
+
virtual void SetTitle( const wxString& text )
{
wxCFStringRef cfText(text);
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 release];
+ [m_osxMenu setImplementation:nil];
+ // gc aware
+ if ( m_osxMenu )
+ CFRelease(m_osxMenu);
}
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;
}