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

renamed OnLinkClicked() event handler to avoid hiding the virtual function with the same name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 23:20:03 +00:00
parent 80475016d1
commit 630906de0e
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/html/helpwnd.cpp
View File

@@ -107,14 +107,14 @@ class wxHtmlHelpHashData : public wxObject
class wxHtmlHelpHtmlWindow : public wxHtmlWindow class wxHtmlHelpHtmlWindow : public wxHtmlWindow
{ {
public: public:
wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent) wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent)
: wxHtmlWindow(parent), m_Window(win) : wxHtmlWindow(parent), m_Window(win)
{ {
SetStandardFonts(); SetStandardFonts();
} }
void OnLinkClicked(wxHtmlLinkEvent& ev) void OnLink(wxHtmlLinkEvent& ev)
{ {
const wxMouseEvent *e = ev.GetLinkInfo().GetEvent(); const wxMouseEvent *e = ev.GetLinkInfo().GetEvent();
if (e == NULL || e->LeftUp()) if (e == NULL || e->LeftUp())
@@ -131,13 +131,12 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
wxString pg = win->GetOpenedPage(); wxString pg = win->GetOpenedPage();
if(!an.empty()) if(!an.empty())
{ {
pg << wxT("#"); pg << wxT("#") << an;
pg << an;
} }
return pg; return pg;
} }
private: private:
wxHtmlHelpWindow *m_Window; wxHtmlHelpWindow *m_Window;
DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow) DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow)
@@ -145,7 +144,7 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
}; };
BEGIN_EVENT_TABLE(wxHtmlHelpHtmlWindow, 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() END_EVENT_TABLE()