From d47b857b09d5c9ea4be669ffac506664d7d41de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sat, 3 Oct 2020 16:12:04 +0200 Subject: [PATCH] Change data and shortHelpString to adhere to naming convention Rename data to clientData in the inlined overloads. This change is transparent for any users. Rename shortHelpString to shortHelp (dito for longHelp). Although this change is in general visible for any users, Phoenix already mangles the the parameter names to strip the 'String' suffix. --- include/wx/tbarbase.h | 12 ++++++------ interface/wx/toolbar.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 6d1b423015..a4b380d6ee 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -295,10 +295,10 @@ public: wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = wxEmptyString, const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) + wxObject *clientData = NULL) { return DoAddTool(toolid, label, bitmap, bmpDisabled, kind, - shortHelp, longHelp, data); + shortHelp, longHelp, clientData); } // the most common AddTool() version @@ -318,10 +318,10 @@ public: const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = wxEmptyString, const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) + wxObject *clientData = NULL) { return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_CHECK, - shortHelp, longHelp, data); + shortHelp, longHelp, clientData); } // add a radio tool, i.e. a tool which can be toggled and releases any @@ -332,10 +332,10 @@ public: const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = wxEmptyString, const wxString& longHelp = wxEmptyString, - wxObject *data = NULL) + wxObject *clientData = NULL) { return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_RADIO, - shortHelp, longHelp, data); + shortHelp, longHelp, clientData); } diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index 84506d9589..3cdb064c73 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -462,9 +462,9 @@ public: whenever another button in the group is checked. ::wxITEM_DROPDOWN specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call SetDropdownMenu() afterwards. - @param shortHelpString + @param shortHelp This string is used for the tools tooltip. - @param longHelpString + @param longHelp This string is shown in the statusbar (if any) of the parent frame when the mouse pointer is inside the tool. @param clientData @@ -481,8 +481,8 @@ public: const wxBitmap& bitmap, const wxBitmap& bmpDisabled, wxItemKind kind = wxITEM_NORMAL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString, + const wxString& shortHelp = wxEmptyString, + const wxString& longHelp = wxEmptyString, wxObject* clientData = NULL); //@}