adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too...

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 5ba3fcaf50a1e7a8bb056f1e41126709a6859c07..9e96180e7f7b065f8ed4fa50072d719c985a5f68 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1019,9 +1019,14 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
+    if ( title == m_label )
+        return;
+
     m_label = title ;
 
-    if ( m_peer && m_peer->IsOk() && !(IsKindOf( CLASSINFO(wxButton) ) && GetId() == wxID_HELP) )
+    InvalidateBestSize();
+
+    if ( m_peer && m_peer->IsOk() )
         m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 
     // do not trigger refreshes upon invisible and possible partly created objects
@@ -1778,7 +1783,7 @@ bool wxWindowMac::MacDoRedraw( long time )
                         break;
                 }
 
-                if ( UseBgCol() && MacGetTopLevelWindow() )
+                if ( UseBgCol() )
                 {
                     dc.SetBackground(GetBackgroundColour());
                     dc.Clear();