Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GetLabel and GetLabelText to be consistent with other platforms.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2007-10-31 01:59:45 +00:00
parent 301f9db326
commit a45091ed51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/stattext.cpp
View File

@@ -137,9 +137,9 @@ wxSize wxStaticText::DoGetBestSize() const
void wxStaticText::SetLabel( const wxString& st )
{
m_label = GetLabelText( st );
m_label = st;
wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
wxMacCFStringHolder str( GetLabelText(m_label), m_font.GetEncoding() );
CFStringRef ref = str;
OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, ref );
verify_noerr( err );

4
src/mac/carbon/window.cpp
View File

@@ -2142,10 +2142,10 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
void wxWindowMac::SetLabel(const wxString& title)
{
m_label = wxStripMenuCodes(title, wxStrip_Mnemonics) ;
m_label = title ;
if ( m_peer && m_peer->Ok() )
m_peer->SetLabel( m_label ) ;
m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
// do not trigger refreshes upon invisible and possible partly created objects
if ( MacIsReallyShown() )