1. extracted MSW-specific part of wxDynamicLibrary in msw/dlmsw.cpp

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index ce47d619054bd3e2306db7f7bd5d60c67e130740..d8ab15b83164d5da519eeae970eda16d63f3565c 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -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 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)))
+        #elif defined(__WXPALMOS__)
+           #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"