Some of these are not in BASE, cahnge back to WXDLLEXPORT

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index cc3e41bcb03ab71b88d908b5db5b83615baca223..5c735c65d91dd26fba24b2076a17412d498da6a9 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -6,107 +6,98 @@
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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
 

-#include "wx/wx.h"
-
-#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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxBestHelpController)
-        

 public:
 public:

-    wxBestHelpController():m_helpControllerType( wxUseNone ),
-        m_helpController( 0 ) {}
-    ~wxBestHelpController() { delete m_helpController; }
-    
+    wxBestHelpController()
+        : m_helpControllerType( wxUseNone ),
+          m_helpController( NULL )
+    {
+    }
+
+    virtual ~wxBestHelpController() { delete m_helpController; }
+

     // 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)
     {

-        wxASSERT( m_helpController );

         return m_helpController->LoadFile( GetValidFilename( file ) );
     }
 
     virtual bool DisplayContents()
     {
         return m_helpController->LoadFile( GetValidFilename( file ) );
     }
 
     virtual bool DisplayContents()
     {

-        wxASSERT( m_helpController );

         return m_helpController->DisplayContents();
     }
 
     virtual bool DisplaySection(int sectionNo)
     {
         return m_helpController->DisplayContents();
     }
 
     virtual bool DisplaySection(int sectionNo)
     {

-        wxASSERT( m_helpController );

         return m_helpController->DisplaySection( sectionNo );
     }
 
     virtual bool DisplaySection(const wxString& section)
     {
         return m_helpController->DisplaySection( sectionNo );
     }
 
     virtual bool DisplaySection(const wxString& section)
     {

-        wxASSERT( m_helpController );

         return m_helpController->DisplaySection( section );
     }
 
     virtual bool DisplayBlock(long blockNo)
     {
         return m_helpController->DisplaySection( section );
     }
 
     virtual bool DisplayBlock(long blockNo)
     {

-        wxASSERT( m_helpController );

         return m_helpController->DisplayBlock( blockNo );
     }
 
     virtual bool DisplayContextPopup(int contextId)
     {
         return m_helpController->DisplayBlock( blockNo );
     }
 
     virtual bool DisplayContextPopup(int contextId)
     {

-        wxASSERT( m_helpController );

         return m_helpController->DisplayContextPopup( contextId );
     }
 
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos)
     {
         return m_helpController->DisplayContextPopup( contextId );
     }
 
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos)
     {

-        wxASSERT( m_helpController );

         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)

     {
     {

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

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

-        wxASSERT( m_helpController );

         return m_helpController->Quit();
     }
 
         return m_helpController->Quit();
     }
 

-    /// Allows one to override the default settings for the help frame.
+    // Allows one to override the default settings for the help frame.

     virtual void SetFrameParameters(const wxString& title,
     virtual void SetFrameParameters(const wxString& title,

-        const wxSize& size,
-        const wxPoint& pos = wxDefaultPosition,
-        bool newFrameEachTime = FALSE)
+                                    const wxSize& size,
+                                    const wxPoint& pos = wxDefaultPosition,
+                                    bool newFrameEachTime = FALSE)

     {
     {

-        wxASSERT( m_helpController );

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

-    /// Obtains the latest settings used by the help frame and the help 
-    /// frame.
+    // Obtains the latest settings used by the help frame and the help frame.

     virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
     virtual wxFrame *GetFrameParameters(wxSize *size = NULL,

-        wxPoint *pos = NULL,
-        bool *newFrameEachTime = NULL)
+                                        wxPoint *pos = NULL,
+                                        bool *newFrameEachTime = NULL)

     {
     {

-        wxASSERT( m_helpController );

         return m_helpController->GetFrameParameters( size, pos,
                                                      newFrameEachTime );
     }
         return m_helpController->GetFrameParameters( size, pos,
                                                      newFrameEachTime );
     }


@@ -114,12 +105,15 @@ public:
 protected:
     // Append/change extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append/change extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 protected:
     enum HelpControllerType { wxUseNone, wxUseHtmlHelp, wxUseChmHelp };
 
     HelpControllerType m_helpControllerType;
     wxHelpControllerBase* m_helpController;
 protected:
     enum HelpControllerType { wxUseNone, wxUseHtmlHelp, wxUseChmHelp };
 
     HelpControllerType m_helpControllerType;
     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