Added ExpandAll and ExpandAllChildren

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

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 722f520a9daade0babba35a76b714c59c269dbee..f272833ff8fa752a877653a0dc1311b6cfa55b3d 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -38,9 +38,6 @@
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 

-%include _html_rename.i
-
-

 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 MAKE_CONST_WXSTRING2(HtmlWindowNameStr,    wxT("htmlWindow"))
 MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, wxT("Printout"))
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 MAKE_CONST_WXSTRING2(HtmlWindowNameStr,    wxT("htmlWindow"))
 MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, wxT("Printout"))


@@ -568,7 +565,8 @@ public:
                                    const wxPoint& pos,
                                    const wxMouseEvent& event);
     
                                    const wxPoint& pos,
                                    const wxMouseEvent& event);
     

-    bool AdjustPagebreak(int* INOUT);
+// TODO:     bool AdjustPagebreak(int* INOUT,
+//                                 wxArrayInt& known_pagebreaks);

     void SetCanLiveOnPagebreak(bool can);
 
     // Can the line be broken before this cell?
     void SetCanLiveOnPagebreak(bool can);
 
     // Can the line be broken before this cell?


@@ -956,7 +954,7 @@ public:
 
     // Set HTML page and display it. !! source is HTML document itself,
     // it is NOT address/filename of HTML document. If you want to
 
     // Set HTML page and display it. !! source is HTML document itself,
     // it is NOT address/filename of HTML document. If you want to

-    // specify document location, use LoadPage() istead
+    // specify document location, use LoadPage() instead

     // Return value : False if an error occurred, True otherwise
     bool SetPage(const wxString& source);
 
     // Return value : False if an error occurred, True otherwise
     bool SetPage(const wxString& source);
 


@@ -1149,10 +1147,8 @@ public:
                           const wxString& normal_face = wxPyEmptyString,
                           const wxString& fixed_face = wxPyEmptyString);
 
                           const wxString& normal_face = wxPyEmptyString,
                           const wxString& fixed_face = wxPyEmptyString);
 

-    int Render(int x, int y, int from = 0, int dont_render = false, int maxHeight = INT_MAX,
-               //int *known_pagebreaks = NULL, int number_of_pages = 0
-               int* choices=NULL, int LCOUNT = 0
-               );
+    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
+               int dont_render = FALSE, int to = INT_MAX);

     int GetTotalHeight();
                 // returns total height of the html document
                 // (compare Render's return value with this)
     int GetTotalHeight();
                 // returns total height of the html document
                 // (compare Render's return value with this)