X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a977709b11432e05af48e205cc02c0a0ad4ecf16..f2d990adc1b8c0e93107eb87df2ab42df849c7fa:/src/generic/tbarsmpl.cpp

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 522736e77f..054fc30003 100644
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -86,7 +86,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
-#if !wxUSE_TOOLBAR_NATIVE
+#if !defined(wxUSE_TOOLBAR_NATIVE) && !defined(__WXUNIVERSAL__)
     #include "wx/toolbar.h"
 
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
@@ -356,13 +356,15 @@ bool wxToolBarSimple::Realize()
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-        m_maxWidth += maxToolWidth;
-    else
         m_maxHeight += maxToolHeight;
+    else
+        m_maxWidth += maxToolWidth;
 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;
 
+    SetSize(m_maxWidth, m_maxHeight);
+
     return TRUE;
 }