compilation fixes for wxUSE_TOOLBAR under MSW

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

include/wx/toolbar.h

@@ -15,7 +15,7 @@
 #include "wx/tbarbase.h"     // the base class for all toolbars
 
 #if wxUSE_TOOLBAR
-    #if !wxUSE_TOOLBAR_NATIVE
+    #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple

src/univ/toolbar.cpp

@@ -34,9 +34,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
+#endif
 
 #include "wx/univ/renderer.h"
-#endif
 
 #include "wx/toolbar.h"
 #include "wx/image.h"