use generic timer in wxMGL and wxX11

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

diff --git a/wxPython/src/htmlhelp.i b/wxPython/src/htmlhelp.i
index f3540613248c55051bd14a4fdb72edd461fe57b1..6926522a590c93208fda522140abf5dd6f642a05 100644 (file)
--- a/wxPython/src/htmlhelp.i
+++ b/wxPython/src/htmlhelp.i
@@ -4,7 +4,7 @@
 //
 // Author:      Robin Dunn
 //
 //
 // Author:      Robin Dunn
 //

-// Created:     25-nov-1998
+// Created:     25-Nov-1998

 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 by Total Control Software
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 by Total Control Software
 // Licence:     wxWindows license


@@ -14,7 +14,7 @@
 %module htmlhelp
 
 %{
 %module htmlhelp
 
 %{

-#include "helpers.h"
+#include "export.h"

 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>
 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>


@@ -37,40 +37,8 @@
 %extern controls2.i
 
 %extern utils.i
 %extern controls2.i
 
 %extern utils.i

-

 %extern html.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,
-    wxID_HTML_SEARCHCHOICE,
-    wxID_HTML_HELPFRAME
-
-};
-
-//---------------------------------------------------------------------------
-
-class  wxHtmlHelpFrameCfg
-{
-public:
-    wxHtmlHelpFrameCfg();
-
-    long x, y, w, h;
-    long sashpos;
-    bool navig_on;
-};
-

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -131,7 +99,7 @@ public:
     wxString FindPageByName(const wxString& page);
     wxString FindPageById(int id);
 
     wxString FindPageByName(const wxString& page);
     wxString FindPageById(int id);
 

-    // **** this one needs fixed...
+    // TODO: this one needs fixed...

     const wxHtmlBookRecArray& GetBookRecArray();
 
     wxHtmlContentsItem* GetContents();
     const wxHtmlBookRecArray& GetBookRecArray();
 
     wxHtmlContentsItem* GetContents();


@@ -148,6 +116,8 @@ public:
                    const wxString& title = wxEmptyString,
                    int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL);
 
                    const wxString& title = wxEmptyString,
                    int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL);
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     wxHtmlHelpData* GetData();
     void SetTitleFormat(const wxString& format);
     void Display(const wxString& x);
     wxHtmlHelpData* GetData();
     void SetTitleFormat(const wxString& format);
     void Display(const wxString& x);


@@ -163,11 +133,27 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+
+enum {
+    wxHF_TOOLBAR,
+    wxHF_FLATTOOLBAR,
+    wxHF_CONTENTS,
+    wxHF_INDEX,
+    wxHF_SEARCH,
+    wxHF_BOOKMARKS,
+    wxHF_OPENFILES,
+    wxHF_PRINT,
+    wxHF_DEFAULTSTYLE,
+};
+
+

 class wxHtmlHelpController : public wxEvtHandler {
 public:
 class wxHtmlHelpController : public wxEvtHandler {
 public:

-    wxHtmlHelpController();
+    wxHtmlHelpController(int style = wxHF_DEFAULTSTYLE);

     ~wxHtmlHelpController();
 
     ~wxHtmlHelpController();
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path);
     bool AddBook(const wxString& book, int show_wait_msg = FALSE);
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path);
     bool AddBook(const wxString& book, int show_wait_msg = FALSE);