Added implementation of MDI using top level windows

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 3de4b65a7347744fdfcce18500dfd92fb5c6c5af..da2c7c2fd4cef3136101319735a615b2e0551de7 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 

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

 #pragma interface "helpwin.h"
 #endif
 
 #pragma interface "helpwin.h"
 #endif
 


@@ -32,14 +32,17 @@ 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);
     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 DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);

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

     virtual bool Quit();
 
     inline wxString GetHelpFile() const { return m_helpFile; }
     virtual bool Quit();
 
     inline wxString GetHelpFile() const { return m_helpFile; }