it is now possible to add custom buttons into wxHtmlHelpFrame's toolbar

[wxWidgets.git] / utils / wxPython / modules / html / helpsys.h

diff --git a/utils/wxPython/modules/html/helpsys.h b/utils/wxPython/modules/html/helpsys.h
index e35ffadf9d440d2a422ede2e81c212f860e0f5b4..e3eb9f645d49d0857e280161ffbe9bc18f780cc0 100644 (file)
--- a/utils/wxPython/modules/html/helpsys.h
+++ b/utils/wxPython/modules/html/helpsys.h
@@ -10,14 +10,14 @@
 #ifndef __HELPSYS_H__
 #define __HELPSYS_H__
 
 #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>
 
 #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
 #include <wx/html/htmlhelp.h>
 
 class wxHtmlHelpSystem : public wxHtmlHelpController


@@ -27,9 +27,9 @@ class wxHtmlHelpSystem : public wxHtmlHelpController
  public:
    wxHtmlHelpSystem() {};
    ~wxHtmlHelpSystem() {};
  public:
    wxHtmlHelpSystem() {};
    ~wxHtmlHelpSystem() {};

-   
-   bool AddBookParam(const wxString& title, const wxString& contfile, 
-                    const wxString& indexfile=wxEmptyString, const wxString& deftopic=wxEmptyString, 
+
+   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);
                     const wxString& path=wxEmptyString, bool show_wait_msg=FALSE);
    // Alternative to AddBook(wxString& hhpfile)
    wxToolBar* CreateToolBar(wxFrame* frame);


@@ -41,7 +41,7 @@ class wxHtmlHelpSystem : public wxHtmlHelpController
    virtual void CreateHelpWindow();
    // Slightly different version than in wxHtmlHelpController; uses helpers above
    // Do nothing if the window already exists
    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, 
+   void SetControls(wxFrame* frame, wxHtmlWindow* htmlwin,

                    wxTreeCtrl* contents=NULL, wxListBox* index=NULL,
                    wxListBox* searchlist=NULL);
    // alternative for CreateHelpWindow(), sets frame, htmlwindow, contents tree, index
                    wxTreeCtrl* contents=NULL, wxListBox* index=NULL,
                    wxListBox* searchlist=NULL);
    // alternative for CreateHelpWindow(), sets frame, htmlwindow, contents tree, index


@@ -73,3 +73,4 @@ class wxHtmlHelpSystem : public wxHtmlHelpController
 };
 
 #endif
 };
 
 #endif

+