From 831f3607872cf6b08d7fc96bc6094e7a1c563b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= Date: Sat, 30 Apr 2016 18:57:29 +0200 Subject: [PATCH] Revert "Only set native label if nonempty in wxWindowMac::SetPeer()" This reverts commit 05862e608dac9cdc2d44a6b87fd1b35ff22d13f6. See https://github.com/wxWidgets/wxWidgets/commit/db9baf9aa5565a7a4f92097b2f0c85439c35b4a6 for the reasons. --- src/osx/window_osx.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 5148658209..b6b25f2405 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -356,8 +356,7 @@ void wxWindowMac::SetPeer(wxOSXWidgetImpl* peer) if ( !m_hasFont ) 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 ) if ( !GetPeer()->IsUserPane() )