Applied part of patch [ 652965 ] Enables toolbar simple in wxUniv

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

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index b7e16e0d4d2575745660aef284f41e4eb44cc393..054fc300038059c0e72dc2bf5dacd021ec2bb75f 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -86,7 +86,7 @@ public:
 
 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)