X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76b49cf49ba9ee9f3eeec9730cb4bc4569ab17f1..1bd2ceb57b0cc9f2b07b8bbb7d38d0e0d2381d3a:/src/common/tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index b67f6544a5..f8957002e0 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -31,12 +31,9 @@
 #ifndef WX_PRECOMP
     #include "wx/control.h"
     #include "wx/frame.h"
-#endif
-
-#if wxUSE_IMAGE
-    #include "wx/image.h"
     #include "wx/settings.h"
-#endif // wxUSE_IMAGE
+    #include "wx/image.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // wxWidgets macros
@@ -126,6 +123,15 @@ wxToolBarBase::wxToolBarBase()
     m_defaultHeight = 15;
 }
 
+void wxToolBarBase::FixupStyle()
+{
+    if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) )
+    {
+        // this is the default
+        m_windowStyle |= wxTB_TOP;
+    }
+}
+
 wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
                                             const wxString& label,
                                             const wxBitmap& bitmap,