Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 0e1a67541b5cfb6cf61a600d7de36248c71681c2..7cc554543527429f9d99f5f532f40dd7a5d4733e 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -1,42 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwin.h
+// Name:        wx/msw/helpwin.h

 // Purpose:     Help system: WinHelp implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Purpose:     Help system: WinHelp implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwin.h"
-#endif
-

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

-class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase

 {
 {

-    DECLARE_CLASS(wxWinHelpController)
-        
+    DECLARE_DYNAMIC_CLASS(wxWinHelpController)
+

 public:
 public:

-    wxWinHelpController() {};
-    ~wxWinHelpController() {};
+    wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+    virtual ~wxWinHelpController() {}

 
     // 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);
     virtual bool DisplayContents();
     virtual bool DisplaySection(int sectionNo);
 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
     virtual bool DisplayContents();
     virtual bool DisplaySection(int sectionNo);

+    virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); }

     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool KeywordSearch(const wxString& k,
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool KeywordSearch(const wxString& k,


@@ -48,7 +45,7 @@ public:
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 private:
     wxString m_helpFile;
 };
 private:
     wxString m_helpFile;
 };