GetFromWindow is available everywhere now

[wxWidgets.git] / wxPython / src / html.i

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 651cfe27677407afa8e8b8cbb0de27b648eb646a..e7160365caa0bab9da606c964a8a23f054912f51 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -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,6 @@ public:
     }
 
     void OnLinkClicked(const wxHtmlLinkInfo& link);
-    void base_OnLinkClicked(const wxHtmlLinkInfo& link);
 
     wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
                                       const wxString& url,
@@ -760,9 +758,6 @@ void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
     if (! found)
         wxHtmlWindow::OnLinkClicked(link);
 }
-void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
-    wxHtmlWindow::OnLinkClicked(link);
-}
 
 
 wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
@@ -939,12 +934,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);
@@ -1255,7 +1254,10 @@ public:
 
     wxHtmlHelpData* GetData();
     wxHtmlHelpController* GetController() const;
+
+    %disownarg( wxHtmlHelpController* controller );
     void SetController(wxHtmlHelpController* controller);
+    %cleardisown( wxHtmlHelpController* controller );
 
     // Displays page x. If not found it will offect the user a choice of
     // searching books.
@@ -1360,7 +1362,9 @@ public:
     wxHtmlHelpController* GetController() const;
 
     /// Sets the help controller associated with the window.
+    %disownarg( wxHtmlHelpController* controller );
     void SetController(wxHtmlHelpController* controller);
+    %cleardisown( wxHtmlHelpController* controller );
 
     /// Returns the help window.
     wxHtmlHelpWindow* GetHelpWindow() const;
@@ -1417,7 +1421,9 @@ public:
     wxHtmlHelpController* GetController() const;
 
     /// Sets the controller associated with this dialog.
+    %disownarg( wxHtmlHelpController* controller );
     void SetController(wxHtmlHelpController* controller);
+    %cleardisown( wxHtmlHelpController* controller );
 
     /// Returns the help window.
     wxHtmlHelpWindow* GetHelpWindow() const;
@@ -1533,8 +1539,6 @@ public:
 
     void MakeModalIfNeeded();
     wxWindow* FindTopLevelWindow();
-
-    %pythoncode { def Destroy(self): pass }
 };