initial attempts to get raw bitmaps working under Mac

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

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 522736e77f32f49162082d384766c18b7f08b509..33d24e417864825d729f618c6c5f30c117cf791c 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -86,7 +86,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 

-#if !wxUSE_TOOLBAR_NATIVE
+#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)

     #include "wx/toolbar.h"
 
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
     #include "wx/toolbar.h"
 
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)


@@ -356,13 +356,15 @@ bool wxToolBarSimple::Realize()
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     }
 
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )

-        m_maxWidth += maxToolWidth;
-    else

         m_maxHeight += maxToolHeight;
         m_maxHeight += maxToolHeight;

+    else
+        m_maxWidth += maxToolWidth;

 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;
 
 
     m_maxWidth += m_xMargin;
     m_maxHeight += m_yMargin;
 

+    SetSize(m_maxWidth, m_maxHeight);
+

     return TRUE;
 }
 
     return TRUE;
 }