From d18e7718fd76e359af9b79ba9fe2fae40fdaaa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 1 Oct 2020 23:33:18 +0200 Subject: [PATCH] Fix wxWindowId parameter type and name in wxHtmlHelpWindow The type obviously should be wxWindowID, not int. Rename the parameter, as it is the only instance where the id is not named 'id', the implementation already uses 'id', and for Phoenix naming it id is also preferred, as the name is used for mangling. The naming change causes no further breakage for Phoenix, as the generator is currently broken anyway for this case. Closes https://github.com/wxWidgets/wxWidgets/pull/2069 --- include/wx/html/helpwnd.h | 2 +- interface/wx/html/helpwnd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index 54639ad877..ffa8369c41 100644 --- a/include/wx/html/helpwnd.h +++ b/include/wx/html/helpwnd.h @@ -80,7 +80,7 @@ class WXDLLIMPEXP_HTML wxHtmlHelpWindow : public wxWindow public: wxHtmlHelpWindow(wxHtmlHelpData* data = NULL) { Init(data); } - wxHtmlHelpWindow(wxWindow* parent, wxWindowID wxWindowID, + wxHtmlHelpWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxNO_BORDER, diff --git a/interface/wx/html/helpwnd.h b/interface/wx/html/helpwnd.h index e2b17d7fbe..99f67fc0e5 100644 --- a/interface/wx/html/helpwnd.h +++ b/interface/wx/html/helpwnd.h @@ -77,7 +77,7 @@ public: For the values of @a helpStyle, please see the documentation for wxHtmlHelpController. */ - wxHtmlHelpWindow(wxWindow* parent, int wxWindowID, + wxHtmlHelpWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxBORDER_NONE,