Fixed source for WinCE compatibility

[wxWidgets.git] / include / wx / msw / helpbest.h

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 3709a6ab636ce5f71e87e77f6364777fbf963616..003f100e8e63e353e3228cb291d52166056d8422 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPBEST_H_
 #define _WX_HELPBEST_H_
 
 #ifndef _WX_HELPBEST_H_
 #define _WX_HELPBEST_H_
 

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

 #pragma interface "helpbest.h"
 #endif
 
 #pragma interface "helpbest.h"
 #endif
 


@@ -20,7 +20,7 @@
 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 

-class WXDLLEXPORT wxBestHelpController: public wxHelpControllerBase
+class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase

 {
 public:
     wxBestHelpController()
 {
 public:
     wxBestHelpController()


@@ -33,6 +33,7 @@ public:
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);

+    virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }

 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString)
 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString)


@@ -70,9 +71,10 @@ public:
         return m_helpController->DisplayTextPopup( text, pos );
     }
 
         return m_helpController->DisplayTextPopup( text, pos );
     }
 

-    virtual bool KeywordSearch(const wxString& k)
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL)

     {
     {

-        return m_helpController->KeywordSearch( k );
+        return m_helpController->KeywordSearch( k, mode );

     }
 
     virtual bool Quit()
     }
 
     virtual bool Quit()


@@ -110,6 +112,7 @@ protected:
     wxHelpControllerBase* m_helpController;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
     wxHelpControllerBase* m_helpController;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)

+    DECLARE_NO_COPY_CLASS(wxBestHelpController)

 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
 };
 
 #endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP