Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change data and shortHelpString to adhere to naming convention

Browse Source 
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.
This commit is contained in:
Stefan Brüns
2020-10-03 16:12:04 +02:00
parent 1171155fee
commit d47b857b09
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/tbarbase.h
View File

@@ -295,10 +295,10 @@ public:
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString, const wxString& longHelp = wxEmptyString,
wxObject *data = NULL) wxObject *clientData = NULL)
{ {
return DoAddTool(toolid, label, bitmap, bmpDisabled, kind, return DoAddTool(toolid, label, bitmap, bmpDisabled, kind,
shortHelp, longHelp, data); shortHelp, longHelp, clientData);
} }
// the most common AddTool() version // the most common AddTool() version
@@ -318,10 +318,10 @@ public:
const wxBitmap& bmpDisabled = wxNullBitmap, const wxBitmap& bmpDisabled = wxNullBitmap,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString, const wxString& longHelp = wxEmptyString,
wxObject *data = NULL) wxObject *clientData = NULL)
{ {
return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_CHECK, 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 // 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 wxBitmap& bmpDisabled = wxNullBitmap,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString, const wxString& longHelp = wxEmptyString,
wxObject *data = NULL) wxObject *clientData = NULL)
{ {
return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_RADIO, return AddTool(toolid, label, bitmap, bmpDisabled, wxITEM_RADIO,
shortHelp, longHelp, data); shortHelp, longHelp, clientData);
} }

8
interface/wx/toolbar.h
View File

@@ -462,9 +462,9 @@ public:
whenever another button in the group is checked. ::wxITEM_DROPDOWN whenever another button in the group is checked. ::wxITEM_DROPDOWN
specifies that a drop-down menu button will appear next to the specifies that a drop-down menu button will appear next to the
tool button (only GTK+ and MSW). Call SetDropdownMenu() afterwards. tool button (only GTK+ and MSW). Call SetDropdownMenu() afterwards.
@param shortHelpString @param shortHelp
This string is used for the tools tooltip. 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 This string is shown in the statusbar (if any) of the parent frame
when the mouse pointer is inside the tool. when the mouse pointer is inside the tool.
@param clientData @param clientData
@@ -481,8 +481,8 @@ public:
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxBitmap& bmpDisabled, const wxBitmap& bmpDisabled,
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
const wxString& shortHelpString = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelpString = wxEmptyString, const wxString& longHelp = wxEmptyString,
wxObject* clientData = NULL); wxObject* clientData = NULL);
//@} //@}