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 6b49e4b4dfb17c4f88a75e1a13588078391a292d..81ca04152df0ea121abad33b3c57953415bcbecc 100644 (file)
--- 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
 #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
         #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);
             }
                 return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
                        shortHelpString, longHelpString);
             }

-            
+

             // old form
             wxToolBarToolBase *AddTool
                                (
             // old form
             wxToolBarToolBase *AddTool
                                (


@@ -56,7 +56,7 @@
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
                        shortHelpString, longHelpString);
             }
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
                        shortHelpString, longHelpString);
             }

-            
+

             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (


@@ -74,7 +74,7 @@
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
                        shortHelpString, longHelpString);
             }
                 return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
                        shortHelpString, longHelpString);
             }

-            
+

         private:
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };
         private:
             DECLARE_DYNAMIC_CLASS(wxToolBar)
         };

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index e17794b8cec44b1b56d843c242eb3f5a1e3d6510..3db050063163c16f36b749af3400d63da8d10bda 100644 (file)
--- 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"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"

-
-    #include "wx/univ/renderer.h"

 #endif
 
 #endif
 

+#include "wx/univ/renderer.h"
+

 #include "wx/toolbar.h"
 #include "wx/image.h"
 
 #include "wx/toolbar.h"
 #include "wx/image.h"