Include wx/font.h according to precompiled headers of wx/wx.h (with other minor clean...

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

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 6f94c924cc8c75669be35aadbb483b1d1d24fe24..54878f1ebdf6722042fbe26771c4762dd6223877 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/tbarbase.cpp
+// Name:        src/common/tbarbase.cpp

 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)
 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)


@@ -26,19 +26,18 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/control.h"
 #ifndef WX_PRECOMP
     #include "wx/control.h"

+    #include "wx/frame.h"
+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-

 #if wxUSE_IMAGE
     #include "wx/image.h"
 #if wxUSE_IMAGE
     #include "wx/image.h"

-    #include "wx/settings.h"

 #endif // wxUSE_IMAGE
 
 #endif // wxUSE_IMAGE
 

-#include "wx/toolbar.h"
-

 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------


@@ -409,7 +408,10 @@ void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
 
 void wxToolBarBase::ClearTools()
 {
 
 void wxToolBarBase::ClearTools()
 {

-    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
+    while ( GetToolsCount() )
+    {
+        DeleteToolByPos(0);
+    }

 }
 
 bool wxToolBarBase::Realize()
 }
 
 bool wxToolBarBase::Realize()