always return 471 from wxApp::GetComCtl32Version() under CE as its commctrl.dll inclu...

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

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 4a172009be9a464ed4aaeb1aa3e0933a7b882772..859290f94ca462c0f25fe364c97a82f359578220 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -6,33 +6,25 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_
 #define _WX_HELPCHM_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPCHM_H_
 #define _WX_HELPCHM_H_
 

-#ifdef __GNUG__
-#pragma interface "helpchm.h"
-#endif
-
-#include "wx/wx.h"
-
-#if wxUSE_HELP
+#if wxUSE_MS_HTML_HELP

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

-class WXDLLEXPORT wxCHMHelpController: public wxHelpControllerBase
+class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase

 {
 {

-    DECLARE_CLASS(wxCHMHelpController)
-        

 public:
 public:

-    wxCHMHelpController() {}
-    ~wxCHMHelpController() {}
-    
+    wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
+

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


@@ -41,19 +33,28 @@ public:
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);

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

     virtual bool Quit();
 
     virtual bool Quit();
 

-    inline wxString GetHelpFile() const { return m_helpFile; }
-    
+    wxString GetHelpFile() const { return m_helpFile; }
+
+    // helper of DisplayTextPopup(), also used in wxSimpleHelpProvider::ShowHelp
+    static bool ShowContextHelpPopup(const wxString& text,
+                                     const wxPoint& pos,
+                                     wxWindow *window);
+

 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 protected:
     wxString m_helpFile;
 protected:
     wxString m_helpFile;

+
+    DECLARE_CLASS(wxCHMHelpController)

 };
 
 };
 

-#endif // wxUSE_HELP
+#endif // wxUSE_MS_HTML_HELP
+

 #endif
 // _WX_HELPCHM_H_
 #endif
 // _WX_HELPCHM_H_