updated samples/html/widget to avoid confusion

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

diff --git a/wxPython/src/htmlhelp.i b/wxPython/src/htmlhelp.i
index f3540613248c55051bd14a4fdb72edd461fe57b1..b9c9bee5e1da7800adc9e9b14bc25ac81cbcf1df 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,48 +37,26 @@
 %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;
-};
-
+//  #ifdef wxUSE_UNICODE
+//  %typemap(python, memberin) wxChar* {
+//      if ($target) delete [] $target;
+//      wxString *tempStr = new wxString($source);
+//      $target = new wxChar[tempStr->Len()+1];
+//      memcpy($target, tempStr->c_str(), (sizeof(wxChar)*tempStr->Len())+sizeof(wxChar));
+//      delete tempStr;
+//  }
+//  #endif

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

-class wxHtmlBookRecord  {
+class wxHtmlBookRecord : public wxObject {

 public:
 public:

-    wxHtmlBookRecord(const wxString& basepath, const wxString& title,
-                    const wxString& start);
+    wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath,
+                     const wxString& title, const wxString& start);

 
 

+    wxString GetBookFile();

     wxString GetTitle();
     wxString GetStart();
     wxString GetBasePath();
     wxString GetTitle();
     wxString GetStart();
     wxString GetBasePath();


@@ -86,18 +64,26 @@ public:
     void SetContentsRange(int start, int end);
     int GetContentsStart();
     int GetContentsEnd();
     void SetContentsRange(int start, int end);
     int GetContentsStart();
     int GetContentsEnd();

+
+    void SetTitle(const wxString& title);
+    void SetBasePath(const wxString& path);
+    void SetStart(const wxString& start);
+
+    wxString GetFullPath(const wxString &page) const;

 };
 
 //---------------------------------------------------------------------------
 
 };
 
 //---------------------------------------------------------------------------
 

-typedef struct
+struct wxHtmlContentsItem

 {
 {

+%readonly

     short int m_Level;
     int m_ID;
     short int m_Level;
     int m_ID;

-    char* m_Name;
-    char* m_Page;
+    wxChar* m_Name;
+    wxChar* m_Page;

     wxHtmlBookRecord *m_Book;
     wxHtmlBookRecord *m_Book;

-} wxHtmlContentsItem;
+%readwrite
+};

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


@@ -131,7 +117,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 +134,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 +151,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);