supporting GetSize, fixes #9969

[wxWidgets.git] / src / aui / auibar.cpp

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 49e1bf8f418b974ee6b84dc29d093100b1fb96eb..da42c3bc4269d261471d523f9f6a893569e4fa49 100644 (file)
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -38,6 +38,8 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"

+// for themeing support
+#include <Carbon/Carbon.h>

 #endif
 
 #include "wx/arrimpl.cpp"
 #endif
 
 #include "wx/arrimpl.cpp"


@@ -1784,7 +1786,9 @@ bool wxAuiToolBar::Realize()
                 vert_sizer->AddStretchSpacer(1);
                 ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND);
                 vert_sizer->AddStretchSpacer(1);
                 vert_sizer->AddStretchSpacer(1);
                 ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND);
                 vert_sizer->AddStretchSpacer(1);

-                if ( (m_style & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
+                if ( (m_style & wxAUI_TB_TEXT) &&
+                     m_tool_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM &&
+                     !item.GetLabel().empty() )

                 {
                     wxSize s = GetLabelSize(item.GetLabel());
                     vert_sizer->Add(1, s.y);
                 {
                     wxSize s = GetLabelSize(item.GetLabel());
                     vert_sizer->Add(1, s.y);