more Unicode fixes for help files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/helpext.h b/include/wx/generic/helpext.h
index 8cdedc4d8970f186f643a539c2bf5f45fcaa4964..0b8c1dfccfd1b30f072107f60be40799bfb87e6f 100644 (file)
--- a/include/wx/generic/helpext.h
+++ b/include/wx/generic/helpext.h
@@ -19,14 +19,10 @@
 
 #ifndef WXEXTHELP_DEFAULTBROWSER
 /// Default browser name.
 
 #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
 /// 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.
 
 /**
    This class implements help via an external browser.

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index faa99f964be94c3691586820aa57ac58217aa98f..070fd1ceb4f9703eed496504b50a3292ee83b757 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -18,6 +18,13 @@
 #include "wx/helpbase.h"
 #include "wx/frame.h"
 
 #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;
 
 
 class WXDLLEXPORT wxExtHelpMapList;
 
 

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 66f90962401e12212e6de8bbed2032ebc939cc3a..9f165b3a5040ee86a72b2debc39174bfa9d3a414 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -46,6 +46,11 @@
 
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 
 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
 /**
    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
       // 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
          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 21c1c6f4d432939328a9e2f9ffc304a72accffdf..816c0e12a61c8898ec11709ff0b40d0ab8cbfd04 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -50,12 +50,6 @@
 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   _T("wxhelp.map")
 
 /// 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.
 /// Maximum line length in map file.
 #define WXEXTHELP_BUFLEN 512
 /// Character introducing comments/documentation field in map file.