return const wxString& from wxFontMapper::GetDefaultConfigPath()

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

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index aaad7d3ff3abc9b76ae0052bbb69140c669da6be..ec671668fe262c7ddb4f2aeae7a1d91365823020 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -14,24 +14,6 @@
 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 

-/// Path separator.
-#ifdef __WXMSW__
-#define WXEXTHELP_SEPARATOR _T('\\')
-#elif defined(__WXMAC__)
-#define WXEXTHELP_SEPARATOR _T(':')
-#else
-#define WXEXTHELP_SEPARATOR _T('/')
-#endif
-
-class WXDLLIMPEXP_ADV wxExtHelpMapList;
-
-#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
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation


@@ -53,10 +35,9 @@ class WXDLLIMPEXP_ADV wxExtHelpMapList;
 
 class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
 {
 
 class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
 {

-DECLARE_CLASS(wxExtHelpController)
-   public:
+public:

    wxExtHelpController(wxWindow* parentWindow = NULL);
    wxExtHelpController(wxWindow* parentWindow = NULL);

-   ~wxExtHelpController();
+   virtual ~wxExtHelpController();

 
    /** Tell it which browser to use.
        The Netscape support will check whether Netscape is already
 
    /** Tell it which browser to use.
        The Netscape support will check whether Netscape is already


@@ -66,12 +47,12 @@ 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.
    */
        @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
 
   // 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.
 
    /** This must be called to tell the controller where to find the
        documentation.


@@ -154,21 +135,30 @@ DECLARE_CLASS(wxExtHelpController)
          return (wxFrame*) NULL;// does nothing by default
       }
 
          return (wxFrame*) NULL;// does nothing by default
       }
 

- protected:
+protected:

    /// Filename of currently active map file.
    /// Filename of currently active map file.

-   wxString         m_MapFile;
+   wxString         m_helpDir;

    /// How many entries do we have in the map file?
    int              m_NumOfEntries;
    /// A list containing all id,url,documentation triples.
    wxList          *m_MapList;
    /// How many entries do we have in the map file?
    int              m_NumOfEntries;
    /// A list containing all id,url,documentation triples.
    wxList          *m_MapList;

+
+private:
+   // parse a single line of the map file (called by LoadFile())
+   //
+   // return true if the line was valid or false otherwise
+   bool ParseMapFileLine(const wxString& line);
+

    /// Deletes the list and all objects.
    void DeleteList(void);
 
    /// Deletes the list and all objects.
    void DeleteList(void);
 

- private:
+

    /// How to call the html viewer.
    wxString         m_BrowserName;
    /// Is the viewer a variant of netscape?
    bool             m_BrowserIsNetscape;
    /// How to call the html viewer.
    wxString         m_BrowserName;
    /// Is the viewer a variant of netscape?
    bool             m_BrowserIsNetscape;

+
+    DECLARE_CLASS(wxExtHelpController)

 };
 
 #endif // wxUSE_HELP
 };
 
 #endif // wxUSE_HELP