a little tweak to the debug code (commented out)

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

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index e7160365caa0bab9da606c964a8a23f054912f51..12396332c1bd643edb8a2cb68acf5cb91c03c320 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -384,6 +384,10 @@ private:
 
 
 //---------------------------------------------------------------------------
+
+%typemap(out) wxHtmlCell*         { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) const wxHtmlCell*   { $result = wxPyMake_wxObject($1, $owner); }
+
 //---------------------------------------------------------------------------
 %newgroup
 
@@ -499,8 +503,13 @@ enum
 
 class wxHtmlCell : public wxObject {
 public:
+    %typemap(out) wxHtmlCell*;    // turn off this typemap
+
     wxHtmlCell();
 
+    // Turn it back on again
+    %typemap(out) wxHtmlCell* { $result = wxPyMake_wxObject($1, $owner); }
+
     int GetPosX();
     int GetPosY();
     int GetWidth();
@@ -582,6 +591,9 @@ class  wxHtmlWordCell : public wxHtmlCell
 {
 public:
     wxHtmlWordCell(const wxString& word, wxDC& dc);
+    wxString ConvertToText(wxHtmlSelection *sel) const;
+    bool IsLinebreakAllowed() const;
+    void SetPreviousWord(wxHtmlWordCell *cell);
 };
 
 
@@ -1138,10 +1150,6 @@ public:
     int GetCurIndex();
     int GetMaxIndex();
     const wxString& GetName();
-    // WXWIN_COMPATIBILITY_2_4
-#if 0
-    wxHtmlContentsItem* GetContentsItem();
-#endif
 };
 
 //---------------------------------------------------------------------------
@@ -1164,13 +1172,6 @@ public:
     // TODO: this one needs fixed...
     const wxHtmlBookRecArray& GetBookRecArray();
 
-    // WXWIN_COMPATIBILITY_2_4
-#if 0
-    wxHtmlContentsItem* GetContents();
-    int GetContentsCnt();
-    wxHtmlContentsItem* GetIndex();
-    int GetIndexCnt();
-#endif
 };
 
 //---------------------------------------------------------------------------