Changes to how overridable C++ methods are virtualized for Python.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,7 +50,6 @@ MAKE_CONST_WXSTRING2(HtmlPrintingTitleStr, wxT("Printing"))
|
||||
// TODO: Split this file into multiple %included files that coresponds to the
|
||||
// wx/html include files (more or less.)
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//---------------------------------------------------------------------------
|
||||
%newgroup
|
||||
|
||||
@@ -730,7 +729,7 @@ public:
|
||||
}
|
||||
|
||||
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||
//- void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||
|
||||
wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
|
||||
const wxString& url,
|
||||
@@ -760,9 +759,9 @@ void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
|
||||
if (! found)
|
||||
wxHtmlWindow::OnLinkClicked(link);
|
||||
}
|
||||
void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
|
||||
wxHtmlWindow::OnLinkClicked(link);
|
||||
}
|
||||
// void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
|
||||
// wxHtmlWindow::OnLinkClicked(link);
|
||||
// }
|
||||
|
||||
|
||||
wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
|
||||
@@ -939,12 +938,16 @@ public:
|
||||
// Converts current page to text:
|
||||
wxString ToText();
|
||||
|
||||
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||
void base_OnSetTitle(const wxString& title);
|
||||
void base_OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
|
||||
void base_OnCellClicked(wxHtmlCell *cell,
|
||||
wxCoord x, wxCoord y,
|
||||
const wxMouseEvent& event);
|
||||
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||
void OnSetTitle(const wxString& title);
|
||||
void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
|
||||
void OnCellClicked(wxHtmlCell *cell,
|
||||
wxCoord x, wxCoord y,
|
||||
const wxMouseEvent& event);
|
||||
%MAKE_BASE_FUNC(HtmlWindow, OnLinkClicked);
|
||||
%MAKE_BASE_FUNC(HtmlWindow, OnSetTitle);
|
||||
%MAKE_BASE_FUNC(HtmlWindow, OnCellMouseHover);
|
||||
%MAKE_BASE_FUNC(HtmlWindow, OnCellClicked);
|
||||
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
Reference in New Issue
Block a user