compilation fix for !MSVC

[wxWidgets.git] / include / wx / toolbar.h

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ab920c591a6e16b367cbf6ff2ba2d13fc3e5620c..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 || defined(__WXUNIVERSAL__)
+    #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,12 +74,14 @@
                 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)
         };
     #else // wxUSE_TOOLBAR_NATIVE
         private:
             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"
            #include "wx/msw/tbar95.h"
         #elif defined(__WXMSW__)
            #include "wx/msw/tbarmsw.h"