wxPython html module updates. The beginings of tag handler support.

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

utils/wxPython/modules/html/build.cfg

@@ -1,8 +1,11 @@
 # -*- python -*-
 
 MODULE = 'htmlc'
-SWIGFILES = ['html.i', ]
+SWIGFILES = ['html.i', ] #'htmlhelp.i' ]
 PYFILES = ['htmlhelper.py']
-SOURCES = ['helpsys.cpp']
+#SOURCES = ['helpsys.cpp']
+
+OTHERSWIGFLAGS = '-I../utils'
+
 # include path for htmlhelp's xpm bitmaps
 OTHERCFLAGS = "-I%s/src/html" % (WXDIR,)

utils/wxPython/modules/html/helpsys.h

@@ -10,14 +10,14 @@
 #ifndef __HELPSYS_H__
 #define __HELPSYS_H__
 
-#include <wx/defs.h>
+#include <wx/wx.h>
 
 #if ! wxUSE_HTML
 #error "wxHtml needed"
 #endif
 
 #include <wx/toolbar.h>
-#include "wx/listbox.h"
+#include <wx/listbox.h>
 #include <wx/html/htmlhelp.h>
 
 class wxHtmlHelpSystem : public wxHtmlHelpController
@@ -73,3 +73,4 @@ class wxHtmlHelpSystem : public wxHtmlHelpController
 };
 
 #endif
+

utils/wxPython/modules/html/html.i

@@ -32,21 +32,19 @@
 %extern windows.i
 %extern _defs.i
 %extern events.i
-//%extern windows2.i
-//%extern windows3.i
-//%extern frames.i
-//%extern misc.i
-//%extern gdi.i
 %extern controls.i
 %extern controls2.i
 
+%extern utils.i
+
+//---------------------------------------------------------------------------
+
 %{
 #ifdef __WXMSW__
-static wxString wxPyEmptyStr("");
+wxString wxPyEmptyStr("");
-static wxPoint wxPyDefaultPosition(wxDefaultPosition);
+wxPoint wxPyDefaultPosition(wxDefaultPosition);
-static wxSize wxPyDefaultSize(wxDefaultSize);
+wxSize wxPyDefaultSize(wxDefaultSize);
 #endif
-static PyThreadState* wxPyThreadState;
 %}
 
 %pragma(python) code = "import wx,htmlhelper"
@@ -67,10 +65,8 @@ TAG_HANDLER_BEGIN(PYTHONTAG, "PYTHON")
 
         int fl = 0;
 
+        bool doSave = wxPyRestoreThread();
         while (1) {
-	   #ifdef WXP_WITH_THREAD
-           PyEval_RestoreThread(wxPyThreadState);
-	   #endif
            if (tag.HasParam("FLOAT"))
                tag.ScanParam("FLOAT", "%i", &fl);
            PyObject* pyfunc = PyDict_GetItemString(mod_dict, "WidgetStarter");
@@ -82,7 +78,7 @@ TAG_HANDLER_BEGIN(PYTHONTAG, "PYTHON")
                errmsg = "WidgetStarter does not appear to be callable";
                break;
            }
-	   SWIG_MakePtr(pbuf, m_WParser->GetWindow(), "_wxHtmlWindow_p");
+           SWIG_MakePtr(pbuf, m_WParser->GetWindow(), "_wxPyHtmlWindow_p");
            PyObject* arglist = Py_BuildValue("(s,s)", pbuf,
                                (const char*)tag.GetAllParams());
            if (! arglist) {
@@ -107,20 +103,15 @@ TAG_HANDLER_BEGIN(PYTHONTAG, "PYTHON")
                errmsg = "Could not make a wxWindow pointer from return ptr";
                break;
            }
-	   #ifdef WXP_WITH_THREAD
+           wxPySaveThread(doSave);
-	   PyEval_SaveThread();
-	   #endif
            wnd -> Show(TRUE);
            m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
            return FALSE;
         }
 
+        wxPySaveThread(doSave);
+
         /* we got out of the loop. Must be an error. Show a box stating it. */
-	
-	#ifdef WXP_WITH_THREAD
-	PyEval_SaveThread();
-	#endif
-	
         wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1,
                               errmsg, wxPoint(0,0),
                               wxSize(300, 100), wxTE_MULTILINE );
@@ -141,30 +132,275 @@ TAGS_MODULE_END(PythonTag)
 
 %}
 
+//---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
-// item of history list
+class wxHtmlTag {
-class HtmlHistoryItem
+public:
-{
+    // Never need to create a new tag...
-    public:
+    //wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache);
-        HtmlHistoryItem(const char* p, const char* a);
+
-        int GetPos() const {return m_Pos;}
+    wxString GetName();
-        void SetPos(int p) {m_Pos = p;}
+    bool HasParam(const wxString& par);
-        const wxString& GetPage() const ;
+    wxString GetParam(const wxString& par, int with_commas = FALSE);
-        const wxString& GetAnchor() const ;
+
+    // Can't do this one as-is, but GetParam should be enough...
+    //int ScanParam(const wxString& par, const char *format, void* param);
+
+    wxString GetAllParams();
+    bool IsEnding();
+    bool HasEnding();
+    int GetBeginPos();
+    int GetEndPos1();
+    int GetEndPos2();
 };
 
-class wxHtmlWindow : public wxScrolledWindow
+
-{
+//---------------------------------------------------------------------------
-    public:
+
-        wxHtmlWindow(wxWindow *parent, int id = -1, 
+class wxHtmlParser {
-                     const wxPoint& pos = wxPyDefaultPosition, 
+public:
-		     const wxSize& size = wxPyDefaultSize,
+    // wxHtmlParser();  This is an abstract base class...
+
+    void SetFS(wxFileSystem *fs);
+    wxFileSystem* GetFS();
+    wxObject* Parse(const wxString& source);
+    void InitParser(const wxString& source);
+    void DoneParser();
+    void DoParsing(int begin_pos, int end_pos);
+    // wxObject* GetProduct();
+    void AddTagHandler(wxHtmlTagHandler *handler);
+    wxString* GetSource();
+
+
+    // void AddText(const char* txt) = 0;
+    // void AddTag(const wxHtmlTag& tag);
+};
+
+
+//---------------------------------------------------------------------------
+
+class wxHtmlWinParser : public wxHtmlParser {
+public:
+    wxHtmlWinParser(wxWindow *wnd);
+
+    void SetDC(wxDC *dc);
+    wxDC* GetDC();
+    int GetCharHeight();
+    int GetCharWidth();
+    wxWindow* GetWindow();
+    void SetFonts(wxString normal_face, int normal_italic_mode,
+                  wxString fixed_face, int fixed_italic_mode, int *LIST);
+
+    wxHtmlContainerCell* GetContainer();
+    wxHtmlContainerCell* OpenContainer();
+    wxHtmlContainerCell* CloseContainer();
+    int GetFontSize();
+    void SetFontSize(int s);
+    int GetFontBold();
+    void SetFontBold(int x);
+    int GetFontItalic();
+    void SetFontItalic(int x);
+    int GetFontUnderlined();
+    void SetFontUnderlined(int x);
+    int GetFontFixed();
+    void SetFontFixed(int x);
+    int GetAlign();
+    void SetAlign(int a);
+    const wxColour& GetLinkColor();
+    void SetLinkColor(const wxColour& clr);
+    const wxColour& GetActualColor();
+    void SetActualColor(const wxColour& clr);
+    const wxString& GetLink();
+    void SetLink(const wxString& link);
+    wxFont* CreateCurrentFont();
+};
+
+
+
+//---------------------------------------------------------------------------
+
+%{
+class wxPyHtmlTagHandler : public wxHtmlTagHandler {
+public:
+    wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
+
+    wxHtmlParser* GetParser() { return m_Parser; }
+    void ParseInner(const wxHtmlTag& tag) { wxHtmlTagHandler::ParseInner(tag); }
+
+    DEC_PYCALLBACK_STRING__pure(GetSupportedTags);
+    DEC_PYCALLBACK_BOOL_TAG_pure(HandleTag);
+
+    PYPRIVATE;
+};
+
+IMP_PYCALLBACK_STRING__pure(wxPyHtmlTagHandler, wxHtmlTagHandler, GetSupportedTags);
+IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlTagHandler, wxHtmlTagHandler, HandleTag);
+
+%}
+
+
+%name(wxHtmlTagHandler) class wxPyHtmlTagHandler {
+public:
+    wxPyHtmlTagHandler();
+
+    void _setSelf(PyObject* self);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self)"
+
+    void SetParser(wxHtmlParser *parser);
+    wxHtmlParser* GetParser();
+    void ParseInner(const wxHtmlTag& tag);
+};
+
+
+//---------------------------------------------------------------------------
+
+%{
+class wxPyHtmlWinTagHandler : public wxHtmlWinTagHandler {
+public:
+    wxPyHtmlWinTagHandler() : wxHtmlWinTagHandler() {};
+
+    wxHtmlWinParser* GetParser() { return m_WParser; }
+    void ParseInner(const wxHtmlTag& tag)
+        { wxHtmlWinTagHandler::ParseInner(tag); }
+
+    DEC_PYCALLBACK_STRING__pure(GetSupportedTags);
+    DEC_PYCALLBACK_BOOL_TAG_pure(HandleTag);
+
+    PYPRIVATE;
+};
+
+IMP_PYCALLBACK_STRING__pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, GetSupportedTags);
+IMP_PYCALLBACK_BOOL_TAG_pure(wxPyHtmlWinTagHandler, wxHtmlWinTagHandler, HandleTag);
+
+%}
+
+
+%name(wxHtmlWinTagHandler) class wxPyHtmlWinTagHandler : public wxPyHtmlTagHandler {
+public:
+    wxPyHtmlWinTagHandler();
+
+    void _setSelf(PyObject* self);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self)"
+
+    void SetParser(wxHtmlParser *parser);
+    wxHtmlWinParser* GetParser();
+    void ParseInner(const wxHtmlTag& tag);
+};
+
+
+//---------------------------------------------------------------------------
+
+%{
+
+class wxPyHtmlTagsModule : public wxHtmlTagsModule {
+public:
+    wxPyHtmlTagsModule(PyObject* thc) : wxHtmlTagsModule() {
+        m_tagHandlerClass = thc;
+        Py_INCREF(m_tagHandlerClass);
+        RegisterModule(this);
+        wxHtmlWinParser::AddModule(this);
+    }
+
+    void OnExit() {
+        Py_DECREF(m_tagHandlerClass);
+        m_tagHandlerClass = NULL;
+        for (int x=0; x < m_objArray.GetCount(); x++) {
+            PyObject* obj = (PyObject*)m_objArray.Item(x);
+            Py_DECREF(obj);
+        }
+    };
+
+    void FillHandlersTable(wxHtmlWinParser *parser) {
+        // Wave our magic wand...  (if it works it's a miracle!  ;-)
+
+        // First, make a new instance of the tag handler
+        PyObject* arg = Py_BuildValue("()");
+        PyObject* obj = PyInstance_New(m_tagHandlerClass, arg, NULL);
+        Py_DECREF(arg);
+
+        // now figure out where it's C++ object is...
+        wxPyHtmlWinTagHandler* thPtr;
+        if (SWIG_GetPtrObj(obj, (void **)&thPtr, "_wxPyHtmlWinTagHandler_p"))
+            return;
+
+        // add it,
+        parser->AddTagHandler(thPtr);
+
+        // and track it.
+        m_objArray.Add(obj);
+    }
+
+private:
+    PyObject*           m_tagHandlerClass;
+    wxArrayPtrVoid      m_objArray;
+
+};
+%}
+
+
+
+%inline %{
+    void wxHtmlWinParser_AddTagHandler(PyObject* tagHandlerClass) {
+        // Dynamically create a new wxModule.  Refcounts tagHandlerClass
+        // and adds itself to the wxModules list and to the wxHtmlWinParser.
+        new wxPyHtmlTagsModule(tagHandlerClass);
+    }
+%}
+
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+// item of history list
+class HtmlHistoryItem {
+public:
+    HtmlHistoryItem(const char* p, const char* a);
+
+    int GetPos();
+    void SetPos(int p);
+    const wxString& GetPage();
+    const wxString& GetAnchor();
+};
+
+
+//---------------------------------------------------------------------------
+%{
+class wxPyHtmlWindow : public wxHtmlWindow {
+public:
+    wxPyHtmlWindow(wxWindow *parent, wxWindowID id = -1,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxHW_SCROLLBAR_AUTO,
+                   const wxString& name = "htmlWindow")
+        : wxHtmlWindow(parent, id, pos, size, style, name)  {};
+
+    DEC_PYCALLBACK__STRING(OnLinkClicked);
+
+    PYPRIVATE;
+};
+
+IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnLinkClicked);
+
+%}
+
+
+%name(wxHtmlWindow) class wxPyHtmlWindow : public wxScrolledWindow {
+public:
+    wxPyHtmlWindow(wxWindow *parent, int id = -1,
+                 wxPoint& pos = wxPyDefaultPosition,
+                 wxSize& size = wxPyDefaultSize,
                  int flags=wxHW_SCROLLBAR_AUTO,
-		     const char* name = "htmlWindow");
+                 char* name = "htmlWindow");
+
+    void _setSelf(PyObject* self);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self)"
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
     %pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
 
+
     bool SetPage(const char* source);
                 // Set HTML page and display it. !! source is HTML document itself,
                 // it is NOT address/filename of HTML document. If you want to
@@ -182,19 +418,20 @@ class wxHtmlWindow : public wxScrolledWindow
                 // Note : you can also use path relative to previously loaded page
                 // Return value : same as SetPage
 
-        wxString GetOpenedPage() const {return m_OpenedPage;}
+    wxString GetOpenedPage();
                 // Returns full location of opened page
 
     void SetRelatedFrame(wxFrame* frame, const char* format);
                 // sets frame in which page title will  be displayed. Format is format of
                 // frame title, e.g. "HtmlHelp : %s". It must contain exactly one %s
-        wxFrame* GetRelatedFrame() const;
+    wxFrame* GetRelatedFrame();
 
     void SetRelatedStatusBar(int bar);
                 // after(!) calling SetRelatedFrame, this sets statusbar slot where messages
                 // will be displayed. Default is -1 = no messages.
 
-        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes);
+    void SetFonts(wxString normal_face, int normal_italic_mode,
+                  wxString fixed_face, int fixed_italic_mode, int *LIST);
                 // sets fonts to be used when displaying HTML page.
                 // *_italic_mode can be either wxSLANT or wxITALIC
 
@@ -205,11 +442,12 @@ class wxHtmlWindow : public wxScrolledWindow
     void SetBorders(int b);
                 // Sets space between text and window borders.
 
-        //virtual void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
+    void ReadCustomization(wxConfigBase *cfg, char* path = "");
                 // saves custom settings into cfg config. it will use the path 'path'
                 // if given, otherwise it will save info into currently selected path.
                 // saved values : things set by SetFonts, SetBorders.
-        //virtual void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
+
+    void WriteCustomization(wxConfigBase *cfg, char* path = "");
                 // ...
 
     bool HistoryBack();
@@ -219,190 +457,41 @@ class wxHtmlWindow : public wxScrolledWindow
     void HistoryClear();
                 // Resets history
 
-        //wxHtmlContainerCell* GetInternalRepresentation() const;
+    // wxHtmlContainerCell* GetInternalRepresentation() const;
                 // Returns pointer to conteiners/cells structure.
                 // It should be used ONLY when printing
 
-        //static void AddFilter(wxHtmlFilter *filter);
-                // Adds input filter
 
-        /* This function needs to be eventified! */
+    void base_OnLinkClicked(const char* link);
-        //virtual void OnLinkClicked(const char* link);
                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
 
-	//static void CleanUpStatics();
-	        // cleans static variables
-
 };
 
-enum {
+// Static methods are mapped to stand-alone functions
-    wxID_HTML_PANEL,
+%inline %{
-    wxID_HTML_BACK,
+    void wxHtmlWindow_AddFilter(wxHtmlFilter *filter) {
-    wxID_HTML_FORWARD,
+        wxHtmlWindow::AddFilter(filter);
-    wxID_HTML_TREECTRL,
-    wxID_HTML_INDEXPAGE,
-    wxID_HTML_INDEXLIST,
-    wxID_HTML_NOTEBOOK,
-    wxID_HTML_SEARCHPAGE,
-    wxID_HTML_SEARCHTEXT,
-    wxID_HTML_SEARCHLIST,
-    wxID_HTML_SEARCHBUTTON
-};
-
-class wxHtmlHelpController : public wxEvtHandler
-{
-public:
-	wxHtmlHelpController();
-        ~wxHtmlHelpController();
-
-	// Images:
-	enum {
-	    IMG_Book = 0,
-	    IMG_Folder,
-	    IMG_Page
-	};
-
-        void SetTitleFormat(const wxString& format) {m_TitleFormat = format;}
-                // Sets format of title of the frame. Must contain exactly one "%s"
-                // (for title of displayed HTML page)
-
-        void SetTempDir(const wxString& path);
-                // Sets directory where temporary files are stored.
-                // These temp files are index & contents file in binary (much faster to read)
-                // form. These files are NOT deleted on program's exit.
-
-        bool AddBook(const wxString& book, bool show_wait_msg = FALSE);
-                // Adds new book. 'book' is location of .htb file (stands for "html book").
-                // See documentation for details on its format.
-                // Returns success.
-                // If show_wait_msg == true then message window with "loading book..." is displayed
-
-        void Display(const wxString& x);
-                // Displays page x. If not found it will offect the user a choice of searching
-                // books.
-                // Looking for the page runs in these steps:
-                // 1. try to locate file named x (if x is for example "doc/howto.htm")
-                // 2. try to open starting page of book x
-                // 3. try to find x in contents (if x is for example "How To ...")
-                // 4. try to find x in index (if x is for example "How To ...")
-                // 5. offer searching and if the user agree, run KeywordSearch
-        %name(DisplayID) void Display(const int id);
-	        // Alternative version that works with numeric ID.
-	        // (uses extension to MS format, <param name="ID" value=id>, see docs)
-
-        void DisplayContents();
-                // Displays help window and focuses contents.
-
-        void DisplayIndex();
-                // Displays help window and focuses index.
-
-        bool KeywordSearch(const wxString& keyword);
-                // Searches for keyword. Returns TRUE and display page if found, return
-                // FALSE otherwise
-                // Syntax of keyword is Altavista-like:
-                // * words are separated by spaces
-                //   (but "\"hello world\"" is only one world "hello world")
-                // * word may be pretended by + or -
-                //   (+ : page must contain the word ; - : page can't contain the word)
-                // * if there is no + or - before the word, + is default
-
-        void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
-                // Assigns config object to the controller. This config is then
-                // used in subsequent calls to Read/WriteCustomization of both help
-                // controller and it's wxHtmlWindow
-
-        void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
-                // saves custom settings into cfg config. it will use the path 'path'
-                // if given, otherwise it will save info into currently selected path.
-                // saved values : things set by SetFonts, SetBorders.
-        void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
-                // ...
-};
-
-class wxHtmlHelpSystem : public wxHtmlHelpController
-{
- public:
-   wxHtmlHelpSystem() {};
-   ~wxHtmlHelpSystem() {};
-   
-   bool AddBookParam(const wxString& title, const wxString& contfile, 
-		     const wxString& indexfile=wxEmptyString, const wxString& deftopic=wxEmptyString, 
-		     const wxString& path=wxEmptyString, bool show_wait_msg=FALSE);
-   // Alternative to AddBook(wxString& hhpfile)
-   wxToolBar* CreateToolBar(wxFrame* frame);
-   // creates a dockable toolbar for the frame, containing hide/show, back and forward buttons
-   wxTreeCtrl* CreateContentsTree(wxWindow* parent);
-   // creates a treecontrol with imagelist for books, folders etc and id wxID_HTML_TREECTRL
-   wxListBox* CreateIndexList(wxWindow* parent);
-   // creates a listbox with the right id
-   virtual void CreateHelpWindow();
-   // Slightly different version than in wxHtmlHelpController; uses helpers above
-   // Do nothing if the window already exists
-   void SetControls(wxFrame* frame, wxHtmlWindow* htmlwin, 
-		    wxTreeCtrl* contents=NULL, wxListBox* index=NULL,
-		    wxListBox* searchlist=NULL);
-   // alternative for CreateHelpWindow(), sets frame, htmlwindow, contents tree, index
-   // listbox and searchlist listbox. If null, their functionality won't be used
-
-   // Some extra accessor functions
-   wxFrame* GetFrame() { return m_Frame; }
-   wxHtmlWindow* GetHtmlWindow() { return m_HtmlWin; }
-   wxTreeCtrl* GetContentsTree() { return m_ContentsBox; }
-   wxListBox* GetIndexList() { return m_IndexBox; }
-   wxListBox* GetSearchList() { return m_SearchList; }
-   wxImageList* GetContentsImageList() { return m_ContentsImageList; }
-   // public interface for wxHtmlHelpControllers handlers, so wxPython can call them
-   void OnToolbar(wxCommandEvent& event);
-   void OnContentsSel(wxTreeEvent& event) {wxHtmlHelpController::OnContentsSel(event);}
-   void OnIndexSel(wxCommandEvent& event) {wxHtmlHelpController::OnIndexSel(event);}
-   void OnSearchSel(wxCommandEvent& event) {wxHtmlHelpController::OnSearchSel(event);}
-   void OnSearch(wxCommandEvent& event) {wxHtmlHelpController::OnSearch(event);}
-   void OnCloseWindow(wxCloseEvent& event);
-
-   // some more protected functions that should be accessible from wxPython
-   void RefreshLists();
-   void CreateContents() { if (!m_IndexBox) return; wxHtmlHelpController::CreateContents(); }
-   // Adds items to m_Contents tree control
-   void CreateIndex() { if (! m_ContentsBox) return; wxHtmlHelpController::CreateIndex(); }
-   // Adds items to m_IndexList
-};
-
-// just for fun, an Altavista-like search engine (the gems that Vaclav has hidden in wxHtml...)
-// but not for wxMSW because it's not DLL exported
-//#ifndef __WXMSW__
-#ifdef THIS_IS_NOT_DEFINED_OKAY
-class wxSearchEngine
-{
-    public:
-        wxSearchEngine() : wxObject() {m_Keyword = NULL;}
-        ~wxSearchEngine() {if (m_Keyword) free(m_Keyword);}
-
-        void LookFor(const wxString& keyword);
-            // Sets the keyword we will be searching for
-
-        bool Scan(wxInputStream *stream);
-            // Scans the stream for the keyword.
-            // Returns TRUE if the stream contains keyword, fALSE otherwise
-	%addmethods {
-		bool ScanFile(const wxString& filename) {
-			if (filename.IsEmpty())
-				return false;
-			wxFileInputStream istr(filename);
-			return self->Scan(&istr);
     }
-	}
+%}
-};
+
-#endif
 
 //---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+%{
+    extern "C" SWIGEXPORT(void) inithtmlhelpc();
+%}
+
 
 %init %{
 
     /* This is a bit cheesy. SWIG happens to call the dictionary d...
      * I save it here, 'cause I don't know how to get it back later! */
     mod_dict = d;
-    wxPyThreadState = PyThreadState_Get();
+
+    //inithtmlhelpc();
+
     wxClassInfo::CleanUpClasses();
     wxClassInfo::InitializeClasses();
 

utils/wxPython/modules/html/htmlhelp.i

@@ -0,0 +1,201 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        htmlhelp.i
+// Purpose:     SWIG definitions of html classes
+//
+// Author:      Robin Dunn
+//
+// Created:     25-nov-1998
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+
+%module htmlhelp
+
+%{
+#include "helpers.h"
+#include <wx/html/htmlwin.h>
+#include <wx/image.h>
+#include <wx/fs_zip.h>
+#include <wx/fs_inet.h>
+#include <wx/wfstream.h>
+#include "helpsys.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%extern windows.i
+%extern _defs.i
+%extern events.i
+%extern controls.i
+%extern controls2.i
+
+%extern utils.i
+
+%extern html.i
+
+//---------------------------------------------------------------------------
+
+enum {
+    wxID_HTML_PANEL,
+    wxID_HTML_BACK,
+    wxID_HTML_FORWARD,
+    wxID_HTML_TREECTRL,
+    wxID_HTML_INDEXPAGE,
+    wxID_HTML_INDEXLIST,
+    wxID_HTML_NOTEBOOK,
+    wxID_HTML_SEARCHPAGE,
+    wxID_HTML_SEARCHTEXT,
+    wxID_HTML_SEARCHLIST,
+    wxID_HTML_SEARCHBUTTON
+};
+
+class wxHtmlHelpController : public wxEvtHandler {
+public:
+    wxHtmlHelpController();
+    ~wxHtmlHelpController();
+
+    // Images:
+    enum {
+        IMG_Book = 0,
+        IMG_Folder,
+        IMG_Page
+    };
+
+    void SetTitleFormat(const wxString& format) {m_TitleFormat = format;}
+                // Sets format of title of the frame. Must contain exactly one "%s"
+                // (for title of displayed HTML page)
+
+    void SetTempDir(const wxString& path);
+                // Sets directory where temporary files are stored.
+                // These temp files are index & contents file in binary (much faster to read)
+                // form. These files are NOT deleted on program's exit.
+
+    bool AddBook(const wxString& book, bool show_wait_msg = FALSE);
+                // Adds new book. 'book' is location of .htb file (stands for "html book").
+                // See documentation for details on its format.
+                // Returns success.
+                // If show_wait_msg == true then message window with "loading book..." is displayed
+
+    void Display(const wxString& x);
+                // Displays page x. If not found it will offect the user a choice of searching
+                // books.
+                // Looking for the page runs in these steps:
+                // 1. try to locate file named x (if x is for example "doc/howto.htm")
+                // 2. try to open starting page of book x
+                // 3. try to find x in contents (if x is for example "How To ...")
+                // 4. try to find x in index (if x is for example "How To ...")
+                // 5. offer searching and if the user agree, run KeywordSearch
+    %name(DisplayID) void Display(const int id);
+	        // Alternative version that works with numeric ID.
+	        // (uses extension to MS format, <param name="ID" value=id>, see docs)
+
+    void DisplayContents();
+                // Displays help window and focuses contents.
+
+    void DisplayIndex();
+                // Displays help window and focuses index.
+
+    bool KeywordSearch(const wxString& keyword);
+                // Searches for keyword. Returns TRUE and display page if found, return
+                // FALSE otherwise
+                // Syntax of keyword is Altavista-like:
+                // * words are separated by spaces
+                //   (but "\"hello world\"" is only one world "hello world")
+                // * word may be pretended by + or -
+                //   (+ : page must contain the word ; - : page can't contain the word)
+                // * if there is no + or - before the word, + is default
+
+    void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
+                // Assigns config object to the controller. This config is then
+                // used in subsequent calls to Read/WriteCustomization of both help
+                // controller and it's wxHtmlWindow
+
+    void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
+                // saves custom settings into cfg config. it will use the path 'path'
+                // if given, otherwise it will save info into currently selected path.
+                // saved values : things set by SetFonts, SetBorders.
+    void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
+                // ...
+};
+
+class wxHtmlHelpSystem : public wxHtmlHelpController {
+public:
+    wxHtmlHelpSystem() {};
+    ~wxHtmlHelpSystem() {};
+
+    bool AddBookParam(const wxString& title, const wxString& contfile,
+                      const wxString& indexfile=wxEmptyString, const wxString& deftopic=wxEmptyString,
+                      const wxString& path=wxEmptyString, bool show_wait_msg=FALSE);
+    // Alternative to AddBook(wxString& hhpfile)
+    wxToolBar* CreateToolBar(wxFrame* frame);
+    // creates a dockable toolbar for the frame, containing hide/show, back and forward buttons
+    wxTreeCtrl* CreateContentsTree(wxWindow* parent);
+    // creates a treecontrol with imagelist for books, folders etc and id wxID_HTML_TREECTRL
+    wxListBox* CreateIndexList(wxWindow* parent);
+    // creates a listbox with the right id
+    virtual void CreateHelpWindow();
+    // Slightly different version than in wxHtmlHelpController; uses helpers above
+    // Do nothing if the window already exists
+    void SetControls(wxFrame* frame, wxHtmlWindow* htmlwin,
+                     wxTreeCtrl* contents=NULL, wxListBox* index=NULL,
+                     wxListBox* searchlist=NULL);
+    // alternative for CreateHelpWindow(), sets frame, htmlwindow, contents tree, index
+    // listbox and searchlist listbox. If null, their functionality won't be used
+
+    // Some extra accessor functions
+    wxFrame* GetFrame() { return m_Frame; }
+    wxHtmlWindow* GetHtmlWindow() { return m_HtmlWin; }
+    wxTreeCtrl* GetContentsTree() { return m_ContentsBox; }
+    wxListBox* GetIndexList() { return m_IndexBox; }
+    wxListBox* GetSearchList() { return m_SearchList; }
+    wxImageList* GetContentsImageList() { return m_ContentsImageList; }
+    // public interface for wxHtmlHelpControllers handlers, so wxPython can call them
+    void OnToolbar(wxCommandEvent& event);
+    void OnContentsSel(wxTreeEvent& event) {wxHtmlHelpController::OnContentsSel(event);}
+    void OnIndexSel(wxCommandEvent& event) {wxHtmlHelpController::OnIndexSel(event);}
+    void OnSearchSel(wxCommandEvent& event) {wxHtmlHelpController::OnSearchSel(event);}
+    void OnSearch(wxCommandEvent& event) {wxHtmlHelpController::OnSearch(event);}
+    void OnCloseWindow(wxCloseEvent& event);
+
+    // some more protected functions that should be accessible from wxPython
+    void RefreshLists();
+    void CreateContents() { if (!m_IndexBox) return; wxHtmlHelpController::CreateContents(); }
+    // Adds items to m_Contents tree control
+    void CreateIndex() { if (! m_ContentsBox) return; wxHtmlHelpController::CreateIndex(); }
+    // Adds items to m_IndexList
+};
+
+// just for fun, an Altavista-like search engine (the gems that Vaclav has hidden in wxHtml...)
+// but not for wxMSW because it's not DLL exported
+//#ifndef __WXMSW__
+#ifdef THIS_IS_NOT_DEFINED_OKAY
+class wxSearchEngine
+{
+    public:
+        wxSearchEngine() : wxObject() {m_Keyword = NULL;}
+        ~wxSearchEngine() {if (m_Keyword) free(m_Keyword);}
+
+        void LookFor(const wxString& keyword);
+            // Sets the keyword we will be searching for
+
+        bool Scan(wxInputStream *stream);
+            // Scans the stream for the keyword.
+            // Returns TRUE if the stream contains keyword, fALSE otherwise
+	%addmethods {
+		bool ScanFile(const wxString& filename) {
+			if (filename.IsEmpty())
+				return false;
+			wxFileInputStream istr(filename);
+			return self->Scan(&istr);
+		}
+	}
+};
+#endif
+
+//---------------------------------------------------------------------------

utils/wxPython/modules/html/msw/html.py

@@ -32,6 +32,242 @@ from image import *
 from printfw import *
 import wx,htmlhelper
 widget = htmlc
+class wxHtmlTagPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetName(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetName,(self,) + _args, _kwargs)
+        return val
+    def HasParam(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_HasParam,(self,) + _args, _kwargs)
+        return val
+    def GetParam(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetParam,(self,) + _args, _kwargs)
+        return val
+    def GetAllParams(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetAllParams,(self,) + _args, _kwargs)
+        return val
+    def IsEnding(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_IsEnding,(self,) + _args, _kwargs)
+        return val
+    def HasEnding(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_HasEnding,(self,) + _args, _kwargs)
+        return val
+    def GetBeginPos(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetBeginPos,(self,) + _args, _kwargs)
+        return val
+    def GetEndPos1(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetEndPos1,(self,) + _args, _kwargs)
+        return val
+    def GetEndPos2(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetEndPos2,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlTag instance at %s>" % (self.this,)
+class wxHtmlTag(wxHtmlTagPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlParserPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetFS(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_SetFS,(self,) + _args, _kwargs)
+        return val
+    def GetFS(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs)
+        return val
+    def Parse(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs)
+        return val
+    def InitParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_InitParser,(self,) + _args, _kwargs)
+        return val
+    def DoneParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_DoneParser,(self,) + _args, _kwargs)
+        return val
+    def DoParsing(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_DoParsing,(self,) + _args, _kwargs)
+        return val
+    def AddTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_AddTagHandler,(self,) + _args, _kwargs)
+        return val
+    def GetSource(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_GetSource,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlParser instance at %s>" % (self.this,)
+class wxHtmlParser(wxHtmlParserPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlWinParserPtr(wxHtmlParserPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetDC,(self,) + _args, _kwargs)
+        return val
+    def GetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) 
+        return val
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs)
+        return val
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetCharWidth,(self,) + _args, _kwargs)
+        return val
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def SetFonts(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs)
+        return val
+    def GetContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetContainer,(self,) + _args, _kwargs)
+        return val
+    def OpenContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_OpenContainer,(self,) + _args, _kwargs)
+        return val
+    def CloseContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_CloseContainer,(self,) + _args, _kwargs)
+        return val
+    def GetFontSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontSize,(self,) + _args, _kwargs)
+        return val
+    def SetFontSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontSize,(self,) + _args, _kwargs)
+        return val
+    def GetFontBold(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontBold,(self,) + _args, _kwargs)
+        return val
+    def SetFontBold(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontBold,(self,) + _args, _kwargs)
+        return val
+    def GetFontItalic(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontItalic,(self,) + _args, _kwargs)
+        return val
+    def SetFontItalic(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontItalic,(self,) + _args, _kwargs)
+        return val
+    def GetFontUnderlined(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontUnderlined,(self,) + _args, _kwargs)
+        return val
+    def SetFontUnderlined(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontUnderlined,(self,) + _args, _kwargs)
+        return val
+    def GetFontFixed(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontFixed,(self,) + _args, _kwargs)
+        return val
+    def SetFontFixed(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontFixed,(self,) + _args, _kwargs)
+        return val
+    def GetAlign(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetAlign,(self,) + _args, _kwargs)
+        return val
+    def SetAlign(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetAlign,(self,) + _args, _kwargs)
+        return val
+    def GetLinkColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLinkColor,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def SetLinkColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetLinkColor,(self,) + _args, _kwargs)
+        return val
+    def GetActualColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetActualColor,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def SetActualColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
+        return val
+    def GetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
+        return val
+    def SetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs)
+        return val
+    def CreateCurrentFont(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlWinParser instance at %s>" % (self.this,)
+class wxHtmlWinParser(wxHtmlWinParserPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWinParser,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlTagHandlerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_SetParser,(self,) + _args, _kwargs)
+        return val
+    def GetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_GetParser,(self,) + _args, _kwargs)
+        if val: val = wxHtmlParserPtr(val) 
+        return val
+    def ParseInner(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_ParseInner,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlTagHandler instance at %s>" % (self.this,)
+class wxHtmlTagHandler(wxHtmlTagHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlTagHandler,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self)
+
+
+
+
+class wxHtmlWinTagHandlerPtr(wxHtmlTagHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_SetParser,(self,) + _args, _kwargs)
+        return val
+    def GetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_GetParser,(self,) + _args, _kwargs)
+        if val: val = wxHtmlWinParserPtr(val) 
+        return val
+    def ParseInner(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_ParseInner,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlWinTagHandler instance at %s>" % (self.this,)
+class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWinTagHandler,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self)
+
+
+
+
 class HtmlHistoryItemPtr :
     def __init__(self,this):
         self.this = this
@@ -62,6 +298,9 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow__setSelf,(self,) + _args, _kwargs)
+        return val
     def SetPage(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetPage,(self,) + _args, _kwargs)
         return val
@@ -90,6 +329,12 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def SetBorders(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_SetBorders,(self,) + _args, _kwargs)
         return val
+    def ReadCustomization(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_ReadCustomization,(self,) + _args, _kwargs)
+        return val
+    def WriteCustomization(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_WriteCustomization,(self,) + _args, _kwargs)
+        return val
     def HistoryBack(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryBack,(self,) + _args, _kwargs)
         return val
@@ -99,12 +344,16 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def HistoryClear(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs)
         return val
+    def base_OnLinkClicked(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxHtmlWindow instance at %s>" % (self.this,)
 class wxHtmlWindow(wxHtmlWindowPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlc.new_wxHtmlWindow,_args,_kwargs)
         self.thisown = 1
+        self._setSelf(self)
         wx._StdWindowCallbacks(self)
         wx._StdOnScrollCallbacks(self)
 
@@ -115,6 +364,10 @@ class wxHtmlWindow(wxHtmlWindowPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
+wxHtmlWinParser_AddTagHandler = htmlc.wxHtmlWinParser_AddTagHandler
+
+wxHtmlWindow_AddFilter = htmlc.wxHtmlWindow_AddFilter
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------

utils/wxPython/modules/html/msw/htmlhelp.py

@@ -0,0 +1,192 @@
+# This file was created automatically by SWIG.
+import htmlhelpc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+class wxHtmlHelpControllerPtr(wxEvtHandlerPtr):
+    IMG_Book = htmlhelpc.wxHtmlHelpController_IMG_Book
+    IMG_Folder = htmlhelpc.wxHtmlHelpController_IMG_Folder
+    IMG_Page = htmlhelpc.wxHtmlHelpController_IMG_Page
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlhelpc=htmlhelpc):
+        if self.thisown == 1 :
+            htmlhelpc.delete_wxHtmlHelpController(self)
+    def SetTitleFormat(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs)
+        return val
+    def SetTempDir(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_SetTempDir,(self,) + _args, _kwargs)
+        return val
+    def AddBook(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_AddBook,(self,) + _args, _kwargs)
+        return val
+    def Display(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_Display,(self,) + _args, _kwargs)
+        return val
+    def DisplayID(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayID,(self,) + _args, _kwargs)
+        return val
+    def DisplayContents(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayContents,(self,) + _args, _kwargs)
+        return val
+    def DisplayIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayIndex,(self,) + _args, _kwargs)
+        return val
+    def KeywordSearch(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_KeywordSearch,(self,) + _args, _kwargs)
+        return val
+    def UseConfig(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_UseConfig,(self,) + _args, _kwargs)
+        return val
+    def ReadCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_ReadCustomization,(self,) + _args, _kwargs)
+        return val
+    def WriteCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_WriteCustomization,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlHelpController instance at %s>" % (self.this,)
+class wxHtmlHelpController(wxHtmlHelpControllerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpController,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlHelpSystemPtr(wxHtmlHelpControllerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlhelpc=htmlhelpc):
+        if self.thisown == 1 :
+            htmlhelpc.delete_wxHtmlHelpSystem(self)
+    def AddBookParam(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_AddBookParam,(self,) + _args, _kwargs)
+        return val
+    def CreateToolBar(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateToolBar,(self,) + _args, _kwargs)
+        if val: val = wxToolBarPtr(val) 
+        return val
+    def CreateContentsTree(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateContentsTree,(self,) + _args, _kwargs)
+        if val: val = wxTreeCtrlPtr(val) 
+        return val
+    def CreateIndexList(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateIndexList,(self,) + _args, _kwargs)
+        if val: val = wxListBoxPtr(val) 
+        return val
+    def CreateHelpWindow(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateHelpWindow,(self,) + _args, _kwargs)
+        return val
+    def SetControls(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_SetControls,(self,) + _args, _kwargs)
+        return val
+    def GetFrame(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetFrame,(self,) + _args, _kwargs)
+        if val: val = wxFramePtr(val) 
+        return val
+    def GetHtmlWindow(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetHtmlWindow,(self,) + _args, _kwargs)
+        return val
+    def GetContentsTree(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetContentsTree,(self,) + _args, _kwargs)
+        if val: val = wxTreeCtrlPtr(val) 
+        return val
+    def GetIndexList(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetIndexList,(self,) + _args, _kwargs)
+        if val: val = wxListBoxPtr(val) 
+        return val
+    def GetSearchList(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetSearchList,(self,) + _args, _kwargs)
+        if val: val = wxListBoxPtr(val) 
+        return val
+    def GetContentsImageList(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_GetContentsImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 
+        return val
+    def OnToolbar(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnToolbar,(self,) + _args, _kwargs)
+        return val
+    def OnContentsSel(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnContentsSel,(self,) + _args, _kwargs)
+        return val
+    def OnIndexSel(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnIndexSel,(self,) + _args, _kwargs)
+        return val
+    def OnSearchSel(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnSearchSel,(self,) + _args, _kwargs)
+        return val
+    def OnSearch(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnSearch,(self,) + _args, _kwargs)
+        return val
+    def OnCloseWindow(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_OnCloseWindow,(self,) + _args, _kwargs)
+        return val
+    def RefreshLists(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_RefreshLists,(self,) + _args, _kwargs)
+        return val
+    def CreateContents(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateContents,(self,) + _args, _kwargs)
+        return val
+    def CreateIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpSystem_CreateIndex,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlHelpSystem instance at %s>" % (self.this,)
+class wxHtmlHelpSystem(wxHtmlHelpSystemPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpSystem,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+wxID_HTML_PANEL = htmlhelpc.wxID_HTML_PANEL
+wxID_HTML_BACK = htmlhelpc.wxID_HTML_BACK
+wxID_HTML_FORWARD = htmlhelpc.wxID_HTML_FORWARD
+wxID_HTML_TREECTRL = htmlhelpc.wxID_HTML_TREECTRL
+wxID_HTML_INDEXPAGE = htmlhelpc.wxID_HTML_INDEXPAGE
+wxID_HTML_INDEXLIST = htmlhelpc.wxID_HTML_INDEXLIST
+wxID_HTML_NOTEBOOK = htmlhelpc.wxID_HTML_NOTEBOOK
+wxID_HTML_SEARCHPAGE = htmlhelpc.wxID_HTML_SEARCHPAGE
+wxID_HTML_SEARCHTEXT = htmlhelpc.wxID_HTML_SEARCHTEXT
+wxID_HTML_SEARCHLIST = htmlhelpc.wxID_HTML_SEARCHLIST
+wxID_HTML_SEARCHBUTTON = htmlhelpc.wxID_HTML_SEARCHBUTTON