Add wx.Rect.InsideRect

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

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index ec90eb47d1672126ffe337b6a289f9428ff5c66d..3212eb0620fd2d73904039c03f98f9bc34f15dcc 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -565,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?


@@ -953,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);
 


@@ -1372,6 +1373,9 @@ enum {
 };
 
 
 };
 
 

+%{
+    typedef wxTreeCtrl wxPyTreeCtrl;
+%}

 
 MustHaveApp(wxHtmlHelpWindow);
 
 
 MustHaveApp(wxHtmlHelpWindow);
 


@@ -1463,7 +1467,7 @@ public:
     wxHtmlHelpFrameCfg& GetCfgData();
 
     // Gets the tree control
     wxHtmlHelpFrameCfg& GetCfgData();
 
     // Gets the tree control

-    wxTreeCtrl *GetTreeCtrl() const;
+    wxPyTreeCtrl *GetTreeCtrl() const;

 
 };
 
 
 };