fixed wxALL_FILES definition in Unicode build

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

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 543aff8fc5d038601954deaa075b3eb15e5b2bfd..054fc300038059c0e72dc2bf5dacd021ec2bb75f 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -86,7 +86,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
 
 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)
     #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;
 }
 


@@ -514,9 +516,11 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
     wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
     wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
 
     wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
     wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
 

-    wxBitmap bitmap = tool->GetBitmap();
+    wxBitmap bitmap = tool->GetNormalBitmap();
+    if (!bitmap.Ok())
+        return;

 
 

-    if ( bitmap.Ok() )
+    if ( !tool->IsToggled() )

     {
 #if wxUSE_PALETTE
 #ifndef __WXGTK__
     {
 #if wxUSE_PALETTE
 #ifndef __WXGTK__