Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv12564/include
Modified Files:
Mversion.h strutil.h
Log Message:
unicode fixes
Index: Mversion.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mversion.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- Mversion.h 29 Aug 2003 00:05:06 -0000 1.25
+++ Mversion.h 12 Oct 2003 01:41:20 -0000 1.26
@@ -22,5 +22,5 @@
#define M_VERSION_MINOR 66
#define M_VERSION_RELEASE 0
-#define M_VERSION_STATUS "" // "a"=alpha
+#define M_VERSION_STATUS _T("") // "a"=alpha
/// the macros to build the version string from the components
@@ -33,5 +33,5 @@
/// full version string
-#define M_VERSION_STRING M_VERSION " 'Clio'"
+#define M_VERSION_STRING M_VERSION _T(" 'Clio'")
#endif //_M_VERSION_H
Index: strutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/strutil.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -b -u -2 -r1.66 -r1.67
--- strutil.h 3 Oct 2003 15:11:21 -0000 1.66
+++ strutil.h 12 Oct 2003 01:41:20 -0000 1.67
@@ -30,9 +30,9 @@
inline bool strutil_isempty(const String &s) { return IsEmpty(s); }
#else
- inline bool strutil_isempty(const String &s) { return *s.c_str() == '\0'; }
+ inline bool strutil_isempty(const String &s) { return *s.c_str() == _T('\0'); }
#endif
/// return true if string is empty
-inline bool strutil_isempty(const char *s) { return s == NULL || *s == '\0'; }
+inline bool strutil_isempty(const wxChar *s) { return s == NULL || *s == _T('\0'); }
/** Read a NL terminated line into a string.
@@ -57,5 +57,5 @@
@param delim the delimiter character
*/
-String strutil_before(const String &str, const char delim);
+String strutil_before(const String &str, const wxChar delim);
/** Get the part of a string after the delimiter.
@@ -64,5 +64,5 @@
@param delim the delimiter character
*/
-String strutil_after(const String &str, const char delim);
+String strutil_after(const String &str, const wxChar delim);
/** Delete whitespace from the beginning of a string.
@@ -129,4 +129,5 @@
@return the newly allocated string, must be deleted[] by caller
*/
+wxChar * strutil_strdup(const wxChar *in);
char * strutil_strdup(const char *in);
@@ -136,5 +137,5 @@
@return the newly allocated string, must be deleted[] by caller
*/
-char *strutil_strdup(String const &in);
+wxChar *strutil_strdup(String const &in);
/**
@@ -146,5 +147,5 @@
@param tlist reference to an STL String list to append the tokens to
*/
-void strutil_tokenise(char *string, const char *delim, kbStringList &tlist);
+void strutil_tokenise(wxChar *string, const wxChar *delim, kbStringList &tlist);
/** Find a next URL in the string.
@@ -216,5 +217,5 @@
*/
String
-strutil_path_parent(String const &path, char separator = STRUTIL_PATH_SEPARATOR);
+strutil_path_parent(String const &path, wxChar separator = STRUTIL_PATH_SEPARATOR);
/** Cut off last name from path and return string that (filename).
@@ -225,5 +226,5 @@
*/
String
-strutil_path_filename(String const &path, char separator = STRUTIL_PATH_SEPARATOR);
+strutil_path_filename(String const &path, wxChar separator = STRUTIL_PATH_SEPARATOR);
/** Compare 2 filenames and return true if they refer to the same file. Notice
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
