[ 1598659 ] make wxAnimationCtrl::SetInactiveBitmap center given bitmap

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index b67f6544a544b5fb57a503dd630dc6ed0bbee642..f8957002e0f8cbc83e5a18752a307975ee96cf1d 100644 (file)
--- 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,