Made wxGTK's wxEventLoop::IsRunning a little more consistent with

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 3d4678894a2f82430033dd18c8c0352661e86872..06e6bdc7ee8dee4e219f8cce28e8118856914213 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -14,18 +14,18 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "helpctrl.h"
 #endif
 
 #if wxUSE_WXHTML_HELP
 
 #pragma interface "helpctrl.h"
 #endif
 
 #if wxUSE_WXHTML_HELP
 

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

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

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

 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 
 
 #define wxID_HTML_HELPFRAME   (wxID_HIGHEST + 1)
 

-class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
+class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 


@@ -35,14 +35,15 @@ public:
 
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
 
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }

-    bool AddBook(const wxString& book, bool show_wait_msg = FALSE);
+    bool AddBook(const wxString& book_url, bool show_wait_msg = FALSE);

     bool AddBook(const wxFileName& book_file, bool show_wait_msg = FALSE);
 
     bool Display(const wxString& x);
     bool Display(int id);
     bool DisplayContents();
     bool DisplayIndex();
     bool AddBook(const wxFileName& book_file, bool show_wait_msg = FALSE);
 
     bool Display(const wxString& x);
     bool Display(int id);
     bool DisplayContents();
     bool DisplayIndex();

-    bool KeywordSearch(const wxString& keyword);
+    bool KeywordSearch(const wxString& keyword,
+                       wxHelpSearchMode mode = wxHELP_SEARCH_ALL);

 
     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 
     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);


@@ -99,6 +100,8 @@ protected:
     wxString            m_titleFormat;
     int                 m_FrameStyle;
     // DECLARE_EVENT_TABLE()
     wxString            m_titleFormat;
     int                 m_FrameStyle;
     // DECLARE_EVENT_TABLE()

+
+    DECLARE_NO_COPY_CLASS(wxHtmlHelpController)

 };
 
 #endif // wxUSE_WXHTML_HELP
 };
 
 #endif // wxUSE_WXHTML_HELP