wxExecuteData is a struct, not class (warning fix)

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 4e1a581f47d85975f8256c981d446961595e9ba8..744a17705f589b85b37d5f5130bdc208aa3888b7 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     20.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -79,7 +79,7 @@ enum
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {
-                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
+                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, NULL,
                        shortHelpString, longHelpString);
             }
 
@@ -95,7 +95,7 @@ enum
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
-                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, -1, -1, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, wxDefaultCoord, wxDefaultCoord, clientData,
                        shortHelpString, longHelpString);
             }
 
@@ -107,7 +107,7 @@ enum
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    wxCoord xPos,
-                                   wxCoord yPos = -1,
+                                   wxCoord yPos = wxDefaultCoord,
                                    wxObject *clientData = NULL,
                                    const wxString& shortHelpString = wxEmptyString,
                                    const wxString& longHelpString = wxEmptyString
@@ -123,10 +123,10 @@ enum
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"
+        #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
+           #include "wx/msw/tbar95.h"
         #elif defined(__WXWINCE__)
            #include "wx/msw/wince/tbarwce.h"
-        #elif defined(__WXMSW__) && defined(__WIN95__)
-           #include "wx/msw/tbar95.h"
         #elif defined(__WXMSW__)
            #include "wx/msw/tbarmsw.h"
         #elif defined(__WXMOTIF__)
@@ -135,6 +135,8 @@ enum
            #include "wx/gtk/tbargtk.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
+        #elif defined(__WXCOCOA__)
+           #include "wx/cocoa/toolbar.h"
         #elif defined(__WXPM__)
            #include "wx/os2/toolbar.h"
         #endif