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

Revert "Only set native label if nonempty in wxWindowMac::SetPeer()"

Browse Source 
This reverts commit 05862e608d.

See db9baf9aa5 for the reasons.
This commit is contained in:
Václav Slavík
2016-04-30 18:57:29 +02:00
parent adb48b3c72
commit 831f360787
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osx/window_osx.cpp
View File

@@ -356,8 +356,7 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer)
if ( !m_hasFont ) if ( !m_hasFont )
DoSetWindowVariant( m_windowVariant ); DoSetWindowVariant( m_windowVariant );
if ( !m_label.empty() ) GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
// for controls we want to use best size for wxDefaultSize params ) // for controls we want to use best size for wxDefaultSize params )
if ( !GetPeer()->IsUserPane() ) if ( !GetPeer()->IsUserPane() )