[ 1563875 ] wxTreeCtrl::FindItem asserts when item not found

[wxWidgets.git] / src / mac / classic / control.cpp

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 5edc253f73bf1c1e5a6d7d1f72cf9844b03c5bf4..d5c0ca1880fdea89878f4a4552cf71d6d4a06b6e 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -207,7 +207,7 @@ wxControl::~wxControl()
 
 void wxControl::SetLabel(const wxString& title)
 {
 
 void wxControl::SetLabel(const wxString& title)
 {

-    m_label = wxStripMenuCodes(title) ;
+    m_label = GetLabelText(title) ;

 
     if ( m_macControl )
     {
 
     if ( m_macControl )
     {


@@ -309,7 +309,7 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 

-    wxMacStringToPascal( wxStripMenuCodes(label) , maclabel ) ;
+    wxMacStringToPascal( GetLabelText(label) , maclabel ) ;

 }
 
 void wxControl::MacPostControlCreate()
 }
 
 void wxControl::MacPostControlCreate()


@@ -398,7 +398,7 @@ void wxControl::MacPostControlCreate()
     SetSize(pos.x, pos.y, new_size.x, new_size.y);
 
 #if wxUSE_UNICODE
     SetSize(pos.x, pos.y, new_size.x, new_size.y);
 
 #if wxUSE_UNICODE

-    UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+    UMASetControlTitle( (ControlHandle) m_macControl , GetLabelText(m_label) , m_font.GetEncoding() ) ;

 #endif
 
     if ( m_macControlIsShown )
 #endif
 
     if ( m_macControlIsShown )