Stripped menu control characters from buttons, static text, radiobox.

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 6570c1303bca0af2695fd3539e4bc967c49af35e..945441b4ea1faaf4a93f026316af07de2b18df4e 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -147,7 +147,7 @@ wxControl::~wxControl()
 
 void wxControl::SetLabel(const wxString& title)
 {
-    m_label = title ;
+    m_label = wxStripMenuCodes(title) ;
 
     if ( (ControlHandle) m_macControl )
     {
@@ -155,9 +155,9 @@ void wxControl::SetLabel(const wxString& title)
         wxString label ;
     
         if( wxApp::s_macDefaultEncodingIsPC )
-            label = wxMacMakeMacStringFromPC( title ) ;
+            label = wxMacMakeMacStringFromPC( m_label ) ;
         else
-            label = title ;
+            label = m_label ;
         
 #if TARGET_CARBON
         c2pstrcpy( (StringPtr) maclabel , label ) ;

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 2d002e7852a9fd24056484ad285b8559a3422cd9..98e7172f9a518b185b88027dca4f94d16d8a790f 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -115,14 +115,14 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        Rect bounds ;
        Str255 title ;
        
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;
 
        m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
     for (i = 0; i < n; i++)
     {
-        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),
+        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(), wxStripMenuCodes(choices[i]),wxPoint(5,20*i+10),
           wxDefaultSize , i == 0 ? wxRB_GROUP : 0 ) ;
         if ( i == 0 )
           m_radioButtonCycle = radBtn ;

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index ac2dc2e4d081f8b2144bcd6e38081c8279003978..bc89591282b5d28ef79cfb8737eefe15150d0884 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -51,7 +51,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         m_windowId = id;
 
     m_windowStyle = style;
-    m_label = label ;
+    m_label = wxStripMenuCodes(label) ;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     SetBestSize( size ) ;

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 6570c1303bca0af2695fd3539e4bc967c49af35e..945441b4ea1faaf4a93f026316af07de2b18df4e 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -147,7 +147,7 @@ wxControl::~wxControl()
 
 void wxControl::SetLabel(const wxString& title)
 {
-    m_label = title ;
+    m_label = wxStripMenuCodes(title) ;
 
     if ( (ControlHandle) m_macControl )
     {
@@ -155,9 +155,9 @@ void wxControl::SetLabel(const wxString& title)
         wxString label ;
     
         if( wxApp::s_macDefaultEncodingIsPC )
-            label = wxMacMakeMacStringFromPC( title ) ;
+            label = wxMacMakeMacStringFromPC( m_label ) ;
         else
-            label = title ;
+            label = m_label ;
         
 #if TARGET_CARBON
         c2pstrcpy( (StringPtr) maclabel , label ) ;

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index 2d002e7852a9fd24056484ad285b8559a3422cd9..98e7172f9a518b185b88027dca4f94d16d8a790f 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -115,14 +115,14 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        Rect bounds ;
        Str255 title ;
        
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;
 
        m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
     for (i = 0; i < n; i++)
     {
-        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),
+        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(), wxStripMenuCodes(choices[i]),wxPoint(5,20*i+10),
           wxDefaultSize , i == 0 ? wxRB_GROUP : 0 ) ;
         if ( i == 0 )
           m_radioButtonCycle = radBtn ;

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index ac2dc2e4d081f8b2144bcd6e38081c8279003978..bc89591282b5d28ef79cfb8737eefe15150d0884 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -51,7 +51,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         m_windowId = id;
 
     m_windowStyle = style;
-    m_label = label ;
+    m_label = wxStripMenuCodes(label) ;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     SetBestSize( size ) ;