accomodating to new files

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

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 63948ad85ed7721b7035ffbeb468e8a373f4f351..205d710c40a9b0640aa7d4c784e42c4d2332e7fd 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -196,8 +196,6 @@ public:
     wxDC* GetDC();
     int GetCharHeight();
     int GetCharWidth();
-    wxPyHtmlWindow* GetWindow();
-    %pythoncode { GetWindow = wx._deprecated(GetWindow) }
 
     wxHtmlWindowInterface *GetWindowInterface();
 
@@ -293,7 +291,7 @@ IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlTagHandler, wxHtmlTagHandler, HandleTag);
 %rename(HtmlTagHandler) wxPyHtmlTagHandler;
 class wxPyHtmlTagHandler : public wxObject {
 public:
-    %pythonAppend wxPyHtmlTagHandler   "self._setCallbackInfo(self, HtmlTagHandler)"
+    %pythonAppend wxPyHtmlTagHandler   setCallbackInfo(HtmlTagHandler)
     wxPyHtmlTagHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -334,7 +332,7 @@ IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, HandleT
 %rename(HtmlWinTagHandler) wxPyHtmlWinTagHandler;
 class wxPyHtmlWinTagHandler : public wxPyHtmlTagHandler {
 public:
-    %pythonAppend wxPyHtmlWinTagHandler    "self._setCallbackInfo(self, HtmlWinTagHandler)"
+    %pythonAppend wxPyHtmlWinTagHandler    setCallbackInfo(HtmlWinTagHandler)
     wxPyHtmlWinTagHandler();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -576,10 +574,6 @@ public:
     // Returns cursor to be used when mouse is over the cell:
     virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const;
 
-    // Returns cursor to be used when mouse is over the cell:
-    wxCursor GetCursor() const;
-    %pythoncode { GetCursor = wx._deprecated(GetCursor) }
-
     // Formatting cells are not visible on the screen, they only alter
     // renderer's state.
     bool IsFormattingCell() const;
@@ -651,7 +645,6 @@ public:
     // only part of the cell inside the selection is converted.
     wxString ConvertToText(wxHtmlSelection *sel) const;
 
-    %property(Cursor, GetCursor, doc="See `GetCursor`");
     %property(Depth, GetDepth, doc="See `GetDepth`");
     %property(Descent, GetDescent, doc="See `GetDescent`");
     %property(FirstChild, GetFirstChild, doc="See `GetFirstChild`");
@@ -798,7 +791,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyHtmlFilter, wxHtmlFilter);
 %rename(HtmlFilter) wxPyHtmlFilter;
 class wxPyHtmlFilter : public wxObject {
 public:
-    %pythonAppend wxPyHtmlFilter   "self._setCallbackInfo(self, HtmlFilter)"
+    %pythonAppend wxPyHtmlFilter   setCallbackInfo(HtmlFilter)
     wxPyHtmlFilter();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -996,7 +989,7 @@ class wxPyHtmlWindow : public wxScrolledWindow //,
                        // public wxHtmlWindowMouseHelper
 {
 public:
-    %pythonAppend wxPyHtmlWindow      "self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)"
+    %pythonAppend wxPyHtmlWindow      "self._setOORInfo(self);" setCallbackInfo(HtmlWindow)
     %pythonAppend wxPyHtmlWindow()    ""
     %typemap(out) wxPyHtmlWindow*;    // turn off this typemap
 
@@ -1546,7 +1539,7 @@ public:
     void RefreshLists();
 
     // Gets the HTML window
-    wxHtmlWindow* GetHtmlWindow() const;
+    wxPyHtmlWindow* GetHtmlWindow() const;
 
     // Gets the splitter window
     wxSplitterWindow* GetSplitterWindow();