GetClientData(int n) should be const (part of patch 649438)

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 5d2754b1fd3bf27154358d673bd0e88c14edb2d3..ad52e6f0c638865db078054f8fddb0c40ab72db0 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -24,27 +24,27 @@
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,
             wxToolBar() { }
 
             wxToolBar(wxWindow *parent,

-                      wxWindowID id,
+                      wxWindowID winid,

                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxNO_BORDER | wxTB_HORIZONTAL,
                       const wxString& name = wxToolBarNameStr)
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
                       long style = wxNO_BORDER | wxTB_HORIZONTAL,
                       const wxString& name = wxToolBarNameStr)

-                : wxToolBarSimple(parent, id, pos, size, style, name) { }
+                : wxToolBarSimple(parent, winid, pos, size, style, name) { }

 
             // the most commonly used version of AddTool()
 
             // the most commonly used version of AddTool()

-            wxToolBarToolBase *AddTool(int id,
+            wxToolBarToolBase *AddTool(int toolid,

                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {
                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
             {

-                return wxToolBarSimple::AddTool(id, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
+                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,

                        shortHelpString, longHelpString);
             }
 
             // old form
             wxToolBarToolBase *AddTool
                                (
                        shortHelpString, longHelpString);
             }
 
             // old form
             wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -53,14 +53,14 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, -1, -1, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, -1, -1, clientData,

                        shortHelpString, longHelpString);
             }
 
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (
                        shortHelpString, longHelpString);
             }
 
             // virtual overridden
             virtual wxToolBarToolBase *AddTool
                                (

-                                   int id,
+                                   int toolid,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,
                                    const wxBitmap& bitmap,
                                    const wxBitmap& pushedBitmap,
                                    bool toggle,


@@ -71,7 +71,7 @@
                                    const wxString& longHelpString = wxEmptyString
                                )
             {
                                    const wxString& longHelpString = wxEmptyString
                                )
             {

-                return wxToolBarSimple::AddTool(id, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
+                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,

                        shortHelpString, longHelpString);
             }
 
                        shortHelpString, longHelpString);
             }