Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 1305f108ffce5b8102a7c89bdc49a2297d1b86d0..cf7fac0a21da36ef2b784eacfc05e3ba08948c48 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -1,7 +1,7 @@
 /*-*- c++ -*-********************************************************
  * helpext.h - an external help controller for wxWidgets            *
  *                                                                  *
- * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
+ * (C) 1998 by Karsten Ballueder (Ballueder@usa.net)                *
  * License: wxWindows licence                                       *
  *                                                                  *
  * $Id$
@@ -14,13 +14,6 @@
 
 #include "wx/helpbase.h"
 
-#ifndef WXEXTHELP_DEFAULTBROWSER
-/// Default browser name.
-#   define WXEXTHELP_DEFAULTBROWSER _T("netscape")
-/// Is default browse a variant of netscape?
-#   define WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE true
-#endif
-
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation
@@ -44,7 +37,7 @@ class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
 {
 public:
    wxExtHelpController(wxWindow* parentWindow = NULL);
-   ~wxExtHelpController();
+   virtual ~wxExtHelpController();
 
    /** Tell it which browser to use.
        The Netscape support will check whether Netscape is already
@@ -54,12 +47,12 @@ public:
        @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(const wxString & browsername = WXEXTHELP_DEFAULTBROWSER,
-                   bool isNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE);
+   void SetBrowser(const wxString& browsername = wxEmptyString,
+                   bool isNetscape = false);
 
   // Set viewer: new name for SetBrowser
-  virtual void SetViewer(const wxString& viewer = WXEXTHELP_DEFAULTBROWSER, long flags = wxHELP_NETSCAPE);
+  virtual void SetViewer(const wxString& viewer = wxEmptyString,
+                         long flags = wxHELP_NETSCAPE);
 
    /** This must be called to tell the controller where to find the
        documentation.