Unicode compilation fix.

[wxWidgets.git] / include / wx / generic / helpext.h

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 32033dea06dc0362fff860f68cf83007a03f6361..ac1284f370a2403e26fc5032359ca026e2a24a64 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -1,16 +1,17 @@
 /*-*- c++ -*-********************************************************
- * exthlp.h - an external help controller for wxWindows             *
+ * helpext.h - an external help controller for wxWindows             *
  *                                                                  *
  * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
  *                                                                  *
  * $Id$
  *******************************************************************/
-#ifndef WXXHELP_H
-#define WXXHELP_H
+
+#ifndef __WX_HELPEXT_H_
+#define __WX_HELPEXT_H_
 
 #if wxUSE_HELP
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #   pragma interface "wxexthlp.h"
 #endif
 
@@ -18,15 +19,10 @@
 
 #ifndef WXEXTHELP_DEFAULTBROWSER
 /// Default browser name.
-#   define WXEXTHELP_DEFAULTBROWSER "netscape"
+#   define WXEXTHELP_DEFAULTBROWSER _T("netscape")
 /// Is default browse a variant of netscape?
 #   define WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE TRUE
 #endif
-/// Name of environment variable to set help browser.
-#define   WXEXTHELP_ENVVAR_BROWSER   "WX_HELPBROWSER"
-/// Is browser a netscape browser?
-#define   WXEXTHELP_ENVVAR_BROWSERISNETSCAPE "WX_HELPBROWSER_NS"
-
 
 /**
    This class implements help via an external browser.
@@ -47,7 +43,7 @@
    Lines starting with ';' will be ignored.
 */
 
-class wxExtHelpController : public wxHTMLHelpControllerBase
+class WXDLLEXPORT wxExtHelpController : public wxHTMLHelpControllerBase
 {      
 DECLARE_CLASS(wxExtHelpController)
    public:
@@ -61,16 +57,22 @@ DECLARE_CLASS(wxExtHelpController)
        @param browsername The command to call a browser/html viewer.
        @param isNetscape Set this to TRUE if the browser is some variant of Netscape.
    */
+   // Obsolete form
    void SetBrowser(wxString const & browsername = WXEXTHELP_DEFAULTBROWSER,
                    bool isNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE);
+
+  // Set viewer: new name for SetBrowser
+  virtual void SetViewer(const wxString& viewer = WXEXTHELP_DEFAULTBROWSER, long flags = wxHELP_NETSCAPE);
+
  private:
    /// How to call the html viewer.
    wxString         m_BrowserName;
    /// Is the viewer a variant of netscape?
    bool             m_BrowserIsNetscape;
    /// Call the browser using a relative URL.
-   bool DisplayHelp(wxString const &);
+   virtual bool DisplayHelp(const wxString&);
 };
 
-#endif  
-#endif
+#endif // wxUSE_HELP
+
+#endif // __WX_HELPEXT_H_