m_font may not have been set yet. Default to letting GetTextExtent

[wxWidgets.git] / src / cocoa / NSWindow.mm

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index bde3aa64ce32cf24b851170e693585e4711be6a8..efc89aca14f10ed820c686eef6e4487e975e4cc6 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -51,8 +51,8 @@
 - (void)windowWillClose: (NSNotification *)notification;
 
 // Menu item handlers
-- (void)wxMenuItemAction: (id)sender;
-- (BOOL)validateMenuItem: (id)menuItem;
+- (void)wxMenuItemAction: (NSMenuItem *)menuItem;
+- (BOOL)validateMenuItem: (NSMenuItem *)menuItem;
 @end //interface wxNSWindowDelegate
 
 @implementation wxNSWindowDelegate : NSObject
@@ -129,13 +129,13 @@
 }
 
 // Menu item handlers
-- (void)wxMenuItemAction: (id)sender
+- (void)wxMenuItemAction: (NSMenuItem *)sender
 {
     wxASSERT(m_wxCocoaInterface);
     m_wxCocoaInterface->CocoaDelegate_wxMenuItemAction(sender);
 }
 
-- (BOOL)validateMenuItem: (id)sender
+- (BOOL)validateMenuItem: (NSMenuItem *)sender
 {
     wxASSERT(m_wxCocoaInterface);
     return m_wxCocoaInterface->CocoaDelegate_validateMenuItem(sender);
@@ -149,7 +149,8 @@
 
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow)
 
-wxCocoaNSWindow::wxCocoaNSWindow()
+wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw)
+:   m_wxTopLevelWindowCocoa(tlw)
 {
     m_cocoaDelegate = [[wxNSWindowDelegate alloc] init];
     [m_cocoaDelegate setWxCocoaInterface: this];