New methods to match CVS changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/html.i

@@ -161,7 +161,9 @@ public:
     void InitParser(const wxString& source);
     void DoneParser();
     void DoParsing(int begin_pos, int end_pos);
+    void StopParsing();
     // wxObject* GetProduct();
+
     void AddTagHandler(wxHtmlTagHandler *handler);
     wxString* GetSource();
     void PushTagHandler(wxHtmlTagHandler* handler, wxString tags);
@@ -510,6 +512,8 @@ public:
 };
 
 
+// TODO: wxHtmlFilterHTML
+
 
 //---------------------------------------------------------------------------
 // wxHtmlWindow

wxPython/src/windows.i

@@ -222,6 +222,10 @@ public:
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
 
     void Fit();
+
+    // set virtual size to satisfy children
+    void FitInside();
+
     wxColour GetBackgroundColour();
     wxBorder GetBorder() const;
 
@@ -291,7 +295,9 @@ public:
     bool IsShown();
     bool IsTopLevel();
     void Layout();
+#ifdef INCLUDE_DEPRECATED
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
+#endif
     void Lower();
     void MakeModal(bool flag=TRUE);
     %name(MoveXY)void Move(int x, int y, int flags = wxSIZE_USE_EXISTING);
@@ -365,6 +371,8 @@ public:
     wxSize GetVirtualSize() const;
     %name(GetVirtualSizeTuple)void GetVirtualSize( int *OUTPUT, int *OUTPUT ) const;
 
+    wxSize GetBestVirtualSize();
+
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);