SWIGged updates for wxMSW

[wxWidgets.git] / src / generic / helphtml.cpp

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 21c1c6f4d432939328a9e2f9ffc304a72accffdf..8aa2840806b67fd6d615803337122ee5bfd190c9 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.


@@ -139,7 +133,11 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          wxChar* f = wxGetWorkingDirectory();
          file = f;
          delete[] f; // wxGetWorkingDirectory returns new memory
          wxChar* f = wxGetWorkingDirectory();
          file = f;
          delete[] f; // wxGetWorkingDirectory returns new memory

+#ifdef __WXMAC__
+         file << ifile;
+#else

          file << WXEXTHELP_SEPARATOR << ifile;
          file << WXEXTHELP_SEPARATOR << ifile;

+#endif

       }
       else
          file = ifile;
       }
       else
          file = ifile;