Unicode compilation fixes, also moved private constants into the .cpp

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

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 44a5cbc4a24068e45b9c9dd98ce71ed0ae920ffb..faa99f964be94c3691586820aa57ac58217aa98f 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -18,19 +18,6 @@
 #include "wx/helpbase.h"
 #include "wx/frame.h"
 
 #include "wx/helpbase.h"
 #include "wx/frame.h"
 

-/// Name for map file.
-#define WXEXTHELP_MAPFILE   "wxhelp.map"
-/// Path separator.
-#ifdef __WXMSW__
-#define WXEXTHELP_SEPARATOR '\\'
-#else
-#define WXEXTHELP_SEPARATOR '/'
-#endif
-/// Maximum line length in map file.
-#define WXEXTHELP_BUFLEN 512
-/// Character introducing comments/documentation field in map file.
-#define WXEXTHELP_COMMENTCHAR   ';'
-

 class WXDLLEXPORT wxExtHelpMapList;
 
 
 class WXDLLEXPORT wxExtHelpMapList;
 
 

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 1f3f59250fb1044c8e903367600b2f9425a8ba85..21c1c6f4d432939328a9e2f9ffc304a72accffdf 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -44,6 +44,23 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+/// 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.
+#define WXEXTHELP_COMMENTCHAR   ';'
+

 #define CONTENTS_ID   0
 
 class wxExtHelpMapEntry : public wxObject
 #define CONTENTS_ID   0
 
 class wxExtHelpMapEntry : public wxObject