don't propagate wxChildFocusEvent outside of wxTLWs

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

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index c71a2d2e9b1bf55f50555081f30a37818800820b..819cc1f136cb21e2d4308bc6d8ccad50bfdebb81 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -16,33 +16,25 @@
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/NSMenu.h"
-#include "wx/cocoa/ObjcPose.h"
 
 #import <Foundation/NSNotification.h>
-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"
 
 // ============================================================================
-// @class wxPoserNSMenu
+// @class WXNSMenu
 // ============================================================================
-@interface wxPoserNSMenu : NSMenu
-{
-}
-
-- (void)dealloc;
-
-@end // wxPoserNSMenu
 
-WX_IMPLEMENT_POSER(wxPoserNSMenu);
-@implementation wxPoserNSMenu : NSMenu
+@implementation WXNSMenu : NSMenu
 
 - (void)dealloc
 {
     wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
     if(menu)
         menu->Cocoa_dealloc();
+    [super dealloc];
 }
 
-@end // wxPoserNSMenu
+@end // WXNSMenu
 
 // ============================================================================
 // @class wxNSMenuNotificationObserver