use wxPopupWindow again

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

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index eb2c412503487838d086f9645a1b2fe471259486..fdc0620a3e7d1ee6e412cb268a97617952d6c3f8 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -28,6 +28,7 @@
 
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
 
 #import <AppKit/NSMenuItem.h>
 #import <AppKit/NSMenu.h>
@@ -54,7 +55,7 @@
 
 - (void)wxMenuItemAction: (id)sender
 {
-    wxLogDebug(wxT("wxMenuItemAction"));
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
     wxMenuItem *item = wxMenuItem::GetFromCocoa(sender);
     wxCHECK_RET(item,wxT("wxMenuItemAction received but no wxMenuItem exists!"));
 
@@ -72,7 +73,7 @@
 - (BOOL)validateMenuItem: (id)menuItem
 {
     // TODO: Do wxWindows validation here and avoid sending during idle time
-    wxLogDebug(wxT("wxMenuItemAction"));
+    wxLogTrace(wxTRACE_COCOA,wxT("wxMenuItemAction"));
     wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
     wxCHECK_MSG(item,NO,wxT("validateMenuItem received but no wxMenuItem exists!"));
     return item->IsEnabled();
@@ -134,7 +135,7 @@ wxMenuItemCocoa::wxMenuItemCocoa(wxMenu *pParentMenu,
           : wxMenuItemBase(pParentMenu, itemid, strName, strHelp, kind, pSubMenu)
 {
     wxAutoNSAutoreleasePool pool;
-    NSString *menuTitle = [[NSString alloc] initWithCString: wxStripMenuCodes(strName).c_str()];
+    NSString *menuTitle = wxInitNSStringWithWxString([NSString alloc],wxStripMenuCodes(strName));
     m_cocoaNSMenuItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:@selector(wxMenuItemAction:) keyEquivalent:@""];
     sm_cocoaHash.insert(wxMenuItemCocoaHash::value_type(m_cocoaNSMenuItem,this));
     [m_cocoaNSMenuItem setTarget:sm_cocoaTarget];