PyCrust updates

[wxWidgets.git] / include / wx / html / helpctrl.h

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 8251c044f4d155539e2ef349702396654c36912d..2106893a9d8e70a4f638d83436b9edf05df3da64 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -18,17 +18,19 @@
 #pragma interface "helpctrl.h"
 #endif
 
 #pragma interface "helpctrl.h"
 #endif
 

-#if wxUSE_HTML
+#if wxUSE_WXHTML_HELP

 
 #include "wx/html/helpfrm.h"
 #include "wx/helpbase.h"
 
 
 #include "wx/html/helpfrm.h"
 #include "wx/helpbase.h"
 

+#define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
+

 class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 public:
 class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 public:

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

     virtual ~wxHtmlHelpController();
 
     void SetTitleFormat(const wxString& format);
     virtual ~wxHtmlHelpController();
 
     void SetTitleFormat(const wxString& format);


@@ -84,8 +86,8 @@ public:
                                wxPoint *pos = NULL,
                                bool *newFrameEachTime = NULL);
 
                                wxPoint *pos = NULL,
                                bool *newFrameEachTime = NULL);
 

-    // Sets the specified book or all books to have the given base path
-    virtual void SetBookBasePath(const wxString& basePath, int which = -1);
+    // Get direct access to help data:
+    wxHtmlHelpData *GetHelpData() { return &m_helpData; }

 
     virtual bool Quit() ;
     virtual void OnQuit() {};
 
     virtual bool Quit() ;
     virtual void OnQuit() {};


@@ -107,6 +109,6 @@ protected:
     // DECLARE_EVENT_TABLE()
 };
 
     // DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // wxUSE_WXHTML_HELP

 
 #endif // _WX_HELPCTRL_H_
 
 #endif // _WX_HELPCTRL_H_