X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e88be8c942cb93035f4220b54595c23eb9f0df9a..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/toolbar.h?ds=sidebyside

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ab920c591a..6b49e4b4df 100644
--- a/include/wx/toolbar.h
+++ b/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 || defined(__WXUNIVERSAL__)
+    #if !wxUSE_TOOLBAR_NATIVE
         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple
@@ -79,7 +79,9 @@
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };
     #else // wxUSE_TOOLBAR_NATIVE
-        #if defined(__WXMSW__) && defined(__WIN95__)
+        #if defined(__WXUNIVERSAL__)
+           #include "wx/univ/toolbar.h"
+        #elif defined(__WXMSW__) && defined(__WIN95__)
            #include "wx/msw/tbar95.h"
         #elif defined(__WXMSW__)
            #include "wx/msw/tbarmsw.h"