From 03e6ca87dba8a5e1d7e777f4fbdba4f1fbd24c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sat, 3 Oct 2020 16:19:06 +0200 Subject: [PATCH] Revert client_data parameter name to clientData Commit 5925893eed47 ("Fix various doxygen issues in the documentation") changed the name to client_data. This does not fit the naming scheme, and breaks some code in Phoenix which assumes the param is called clientData (to be able to use a binding specific type for it). --- interface/wx/ribbon/toolbar.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/wx/ribbon/toolbar.h b/interface/wx/ribbon/toolbar.h index cb6045d665..77fff36f0e 100644 --- a/interface/wx/ribbon/toolbar.h +++ b/interface/wx/ribbon/toolbar.h @@ -130,7 +130,7 @@ public: The UI help string to associate with the new tool. @param kind The kind of tool to add. - @param client_data + @param clientData Client data to associate with the new tool. @return An opaque pointer which can be used only with other tool bar @@ -144,7 +144,7 @@ public: const wxBitmap& bitmap_disabled = wxNullBitmap, const wxString& help_string = wxEmptyString, wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL, - wxObject* client_data = NULL); + wxObject* clientData = NULL); /** Add a separator to the tool bar. @@ -232,7 +232,7 @@ public: The UI help string to associate with the new tool. @param kind The kind of tool to add. - @param client_data + @param clientData Client data to associate with the new tool. @return An opaque pointer which can be used only with other tool bar @@ -249,7 +249,7 @@ public: const wxBitmap& bitmap_disabled = wxNullBitmap, const wxString& help_string = wxEmptyString, wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL, - wxObject* client_data = NULL); + wxObject* clientData = NULL); /** Insert a separator to the tool bar at the specified position.