Simpler version of [ 1604590 ] wxListCtrl::FindItem & wxString

[wxWidgets.git] / src / generic / buttonbar.cpp

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index 98b1b160a7f974126d6d1801987ac7183b5441a9..343e7e585a91e1f955f48c53ad80f37f8df15a8b 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -36,11 +36,10 @@
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-#include "wx/settings.h"
-
 // ----------------------------------------------------------------------------
 // wxButtonToolBarTool: our implementation of wxToolBarToolBase
 // ----------------------------------------------------------------------------
@@ -352,7 +351,7 @@ bool wxButtonToolBar::Realize()
     m_needsLayout = true;
     DoLayout();
 
-    SetBestSize(wxSize(m_maxWidth, m_maxHeight));
+    SetInitialSize(wxSize(m_maxWidth, m_maxHeight));
 
     return true;
 }