clear up wxStringBuffer docs a bit

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ff1ae8a51f113dd70bd21273f5f26c5d694fd946..a830694c787c9c67d48b488f551c0fd542265d3b 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$
 // Modified by:
 // Created:     20.11.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -79,7 +79,7 @@ enum
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {
                                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);
             }
 
                        shortHelpString, longHelpString);
             }
 


@@ -95,7 +95,7 @@ enum
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    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);
             }
 
                        shortHelpString, longHelpString);
             }
 


@@ -107,7 +107,7 @@ enum
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    wxCoord xPos,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    wxCoord xPos,

-                                   wxCoord yPos = -1,
+                                   wxCoord yPos = wxDefaultCoord,

                                    wxObject *clientData = NULL,
                                    const wxString& shortHelpString = wxEmptyString,
                                    const wxString& longHelpString = wxEmptyString
                                    wxObject *clientData = NULL,
                                    const wxString& shortHelpString = wxEmptyString,
                                    const wxString& longHelpString = wxEmptyString


@@ -123,7 +123,9 @@ enum
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXUNIVERSAL__)
            #include "wx/univ/toolbar.h"

-        #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !wxUSE_POCKETPC_UI))
+        #elif defined(__PALMOS__)
+           #include "wx/palmos/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"
            #include "wx/msw/tbar95.h"
         #elif defined(__WXWINCE__)
            #include "wx/msw/wince/tbarwce.h"