Use wxStripMenuCodes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 093bc3fcf5eff66fc45d5f219326963793c9a22d..7b93013217cb15932c6238b39e7a38406a41fb49 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -43,7 +43,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];

-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];

     [GetNSControl() sizeToFit];
 
     if(m_parent)
     [GetNSControl() sizeToFit];
 
     if(m_parent)


@@ -73,7 +73,7 @@ wxString wxButton::GetLabel() const
 
 void wxButton::SetLabel(const wxString& label)
 {
 
 void wxButton::SetLabel(const wxString& label)
 {

-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];

 }
 
 wxSize wxButtonBase::GetDefaultSize()
 }
 
 wxSize wxButtonBase::GetDefaultSize()

diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm
index b43f179077d8d1340c5863c4959c4291d54e537e..04204304f11c7d3f63916a1ba5babd32b9341982 100644 (file)
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -17,6 +17,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>
 
 #import <AppKit/NSButton.h>
 #import <Foundation/NSString.h>


@@ -41,7 +42,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID winid,
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSSwitchButton];
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSSwitchButton];

-    [GetNSButton() setTitle:[NSString stringWithCString: label.c_str()]];
+    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];

     [GetNSControl() sizeToFit];
 
     if(m_parent)
     [GetNSControl() sizeToFit];
 
     if(m_parent)