Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 0345d504b56969f568057468c7d35e4a63d67ad0..452a074c2c593b459004261727cabb692324a2e7 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -12,15 +12,16 @@
 #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
 

-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+    && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)

 
 #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 +34,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 +72,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()


@@ -84,7 +87,7 @@ public:
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,

-                                    bool newFrameEachTime = FALSE)
+                                    bool newFrameEachTime = false)

     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );
     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );