From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 Mar 2002 00:33:05 +0000 (+0000)
Subject: compilation fixes for wxUSE_TOOLBAR under MSW
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a9b33d6bb46eb4e7d4c38796cc7522e8f66b1da9?ds=sidebyside

compilation fixes for wxUSE_TOOLBAR under MSW


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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 6b49e4b4df..81ca04152d 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
+    #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
         #include "wx/tbarsmpl.h"
 
         class WXDLLEXPORT wxToolBar : public wxToolBarSimple
@@ -40,7 +40,7 @@
                 return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
                        shortHelpString, longHelpString);
             }
-            
+
             // old form
             wxToolBarToolBase *AddTool
                                (
@@ -56,7 +56,7 @@
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
                        shortHelpString, longHelpString);
             }
-            
+
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (
@@ -74,7 +74,7 @@
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
                        shortHelpString, longHelpString);
             }
-            
+
         private:
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };
diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index e17794b8ce..3db0500631 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -34,10 +34,10 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
-
-    #include "wx/univ/renderer.h"
 #endif
 
+#include "wx/univ/renderer.h"
+
 #include "wx/toolbar.h"
 #include "wx/image.h"