Another merge of 2.6 changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -245,7 +245,7 @@ public:
|
||||
|
||||
%{
|
||||
class wxPyHtmlTagHandler : public wxHtmlTagHandler {
|
||||
DECLARE_DYNAMIC_CLASS(wxPyHtmlTagHandler);
|
||||
DECLARE_DYNAMIC_CLASS(wxPyHtmlTagHandler)
|
||||
public:
|
||||
wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
|
||||
|
||||
@@ -283,7 +283,7 @@ public:
|
||||
|
||||
%{
|
||||
class wxPyHtmlWinTagHandler : public wxHtmlWinTagHandler {
|
||||
DECLARE_DYNAMIC_CLASS(wxPyHtmlWinTagHandler);
|
||||
DECLARE_DYNAMIC_CLASS(wxPyHtmlWinTagHandler)
|
||||
public:
|
||||
wxPyHtmlWinTagHandler() : wxHtmlWinTagHandler() {};
|
||||
|
||||
@@ -642,7 +642,7 @@ public:
|
||||
|
||||
%{ // here's the C++ version
|
||||
class wxPyHtmlFilter : public wxHtmlFilter {
|
||||
DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter);
|
||||
DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter)
|
||||
public:
|
||||
wxPyHtmlFilter() : wxHtmlFilter() {}
|
||||
|
||||
@@ -710,7 +710,7 @@ public:
|
||||
|
||||
%{
|
||||
class wxPyHtmlWindow : public wxHtmlWindow {
|
||||
DECLARE_ABSTRACT_CLASS(wxPyHtmlWindow);
|
||||
DECLARE_ABSTRACT_CLASS(wxPyHtmlWindow)
|
||||
public:
|
||||
wxPyHtmlWindow(wxWindow *parent, wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
|
Reference in New Issue
Block a user