From aa0ffd1d926cb1282fb75a1ce0e083421ade2f0b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 Jan 2002 16:03:50 +0000
Subject: [PATCH] more Unicode fixes for help files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/helpext.h  | 6 +-----
 include/wx/generic/helphtml.h | 7 +++++++
 src/generic/helpext.cpp       | 7 ++++++-
 src/generic/helphtml.cpp      | 6 ------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 8cdedc4d89..0b8c1dfccf 100644
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -19,14 +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.
diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index faa99f964b..070fd1ceb4 100644
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -18,6 +18,13 @@
 #include "wx/helpbase.h"
 #include "wx/frame.h"
 
+/// Path separator.
+#ifdef __WXMSW__
+#define WXEXTHELP_SEPARATOR _T('\\')
+#else
+#define WXEXTHELP_SEPARATOR _T('/')
+#endif
+
 class WXDLLEXPORT wxExtHelpMapList;
 
 
diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 66f9096240..9f165b3a50 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -46,6 +46,11 @@
 
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
+/// 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.
    It requires the name of a directory containing the documentation
@@ -140,7 +145,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
 #endif
-	{
+      {
          long success;
          command << m_BrowserName << wxT(" -remote openURL(")
                  << wxT("file://") << m_MapFile
diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 21c1c6f4d4..816c0e12a6 100644
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -50,12 +50,6 @@
 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   _T("wxhelp.map")
-/// Path separator.
-#ifdef __WXMSW__
-#define WXEXTHELP_SEPARATOR _T('\\')
-#else
-#define WXEXTHELP_SEPARATOR _T('/')
-#endif
 /// Maximum line length in map file.
 #define WXEXTHELP_BUFLEN 512
 /// Character introducing comments/documentation field in map file.
-- 
2.45.2