renamed OnLinkClicked() event handler to avoid hiding the virtual function with the same name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -114,7 +114,7 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
|
||||
SetStandardFonts();
|
||||
}
|
||||
|
||||
void OnLinkClicked(wxHtmlLinkEvent& ev)
|
||||
void OnLink(wxHtmlLinkEvent& ev)
|
||||
{
|
||||
const wxMouseEvent *e = ev.GetLinkInfo().GetEvent();
|
||||
if (e == NULL || e->LeftUp())
|
||||
@@ -131,8 +131,7 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
|
||||
wxString pg = win->GetOpenedPage();
|
||||
if(!an.empty())
|
||||
{
|
||||
pg << wxT("#");
|
||||
pg << an;
|
||||
pg << wxT("#") << an;
|
||||
}
|
||||
return pg;
|
||||
}
|
||||
@@ -145,7 +144,7 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
|
||||
};
|
||||
|
||||
BEGIN_EVENT_TABLE(wxHtmlHelpHtmlWindow, wxHtmlWindow)
|
||||
EVT_HTML_LINK_CLICKED(wxID_ANY, wxHtmlHelpHtmlWindow::OnLinkClicked)
|
||||
EVT_HTML_LINK_CLICKED(wxID_ANY, wxHtmlHelpHtmlWindow::OnLink)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user