include "wx/toolbar.h" instead of tbar(base|smpl).h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 9b03daccee3159dd2aaede9448ae8605ae5d14fe..a187599235a0ad8bbb3dc0fc5eb6900c54ceebaf 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -38,7 +38,7 @@
 #include "wx/image.h"
 #include "wx/settings.h"
 
-#include "wx/tbarbase.h"
+#include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
 // wxWindows macros

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index f6dbd31a5543567f486e2aef5bfdfcac5c4a455e..985c33e72732f319c2d6f1497f8cd78a439cb140 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -37,7 +37,7 @@
     #include "wx/dcmemory.h"
 #endif
 
-#include "wx/tbarsmpl.h"
+#include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -87,8 +87,6 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
 #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
-    #include "wx/toolbar.h"
-
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
 #endif