Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv3286/include
Modified Files:
Message.h MessageCC.h Moptions.h Munix.h Mwin.h PathFinder.h
Log Message:
unicode fixes
Index: Message.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Message.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -b -u -2 -r1.67 -r1.68
--- Message.h 18 Sep 2003 16:30:42 -0000 1.67
+++ Message.h 11 Oct 2003 17:02:36 -0000 1.68
@@ -99,5 +99,5 @@
/// the pointer to the current position inside m_header
- const char *m_pcCurrent;
+ const wxChar *m_pcCurrent;
};
@@ -116,5 +116,5 @@
/** This constructor creates a Message from a string.
*/
- static Message *Create(const char * itext,
+ static Message *Create(const wxChar * itext,
UIdType uid = UID_ILLEGAL,
Profile *profile = NULL);
Index: MessageCC.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageCC.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -b -u -2 -r1.58 -r1.59
--- MessageCC.h 19 Sep 2003 13:31:19 -0000 1.58
+++ MessageCC.h 11 Oct 2003 17:02:36 -0000 1.59
@@ -35,5 +35,5 @@
public:
// get specfied header lines
- virtual wxArrayString GetHeaderLines(const char **headers,
+ virtual wxArrayString GetHeaderLines(const wxChar **headers,
wxArrayInt *encodings = NULL) const;
@@ -140,5 +140,5 @@
virtual UIdType GetUId(void) const { return m_uid; }
- static MessageCC *Create(const char *text,
+ static MessageCC *Create(const wxChar *text,
UIdType uid = UID_ILLEGAL,
Profile *profile = NULL)
@@ -161,5 +161,5 @@
/// constructors called by Create()
MessageCC(MailFolderCC *folder, const HeaderInfo& hi);
- MessageCC(const char *text,
+ MessageCC(const wxChar *text,
UIdType uid = UID_ILLEGAL,
Profile *profile = NULL);
Index: Moptions.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Moptions.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -b -u -2 -r1.84 -r1.85
--- Moptions.h 10 Oct 2003 21:56:32 -0000 1.84
+++ Moptions.h 11 Oct 2003 17:02:36 -0000 1.85
@@ -430,746 +430,746 @@
//@{
/// our version
-#define MP_VERSION_NAME "Version"
+#define MP_VERSION_NAME _T("Version")
/// are we running for the first time?
-#define MP_FIRSTRUN_NAME "FirstRun"
+#define MP_FIRSTRUN_NAME _T("FirstRun")
/// shall we record default values in configuration files
-#define MP_RECORDDEFAULTS_NAME "RecordDefaults"
+#define MP_RECORDDEFAULTS_NAME _T("RecordDefaults")
/// expand env vars in entries read from config?
[...1770 lines suppressed...]
#define MP_SYNC_REMOTE_DEFVAL 0L
/// IMAP folder to sync to
-#define MP_SYNC_FOLDER_DEFVAL "MahoganySharedConfig"
+#define MP_SYNC_FOLDER_DEFVAL _T("MahoganySharedConfig")
/// our last sync date
#define MP_SYNC_DATE_DEFVAL 0L
@@ -2244,5 +2244,5 @@
#define MP_SYNC_FOLDERS_DEFVAL 0L
/// sync folder tree
-#define MP_SYNC_FOLDERGROUP_DEFVAL ""
+#define MP_SYNC_FOLDERGROUP_DEFVAL wxEmptyString
/** @name sending */
@@ -2270,5 +2270,5 @@
/// name of addressbook to use in whitelist spam filter
-#define MP_WHITE_LIST_DEFVAL "whitelist.adb"
+#define MP_WHITE_LIST_DEFVAL _T("whitelist.adb")
/// treat mail in this folder as junk mail
Index: Munix.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Munix.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- Munix.h 13 Oct 2002 12:24:53 -0000 1.7
+++ Munix.h 11 Oct 2003 17:02:36 -0000 1.8
@@ -10,8 +10,8 @@
/// separating directories in a pathname
-#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR _T('/')
/// separating directories in a search path
-#define PATH_SEPARATOR ':'
+#define PATH_SEPARATOR _T(':')
#endif
Index: Mwin.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mwin.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- Mwin.h 22 Jul 2003 12:25:41 -0000 1.9
+++ Mwin.h 11 Oct 2003 17:02:36 -0000 1.10
@@ -10,8 +10,8 @@
/// separating directories in a pathname
-#define DIR_SEPARATOR '\\'
+#define DIR_SEPARATOR _T('\\')
/// separating directories in a search path
-#define PATH_SEPARATOR ';'
+#define PATH_SEPARATOR _T(';')
/// not defined by makefile
Index: PathFinder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/PathFinder.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- PathFinder.h 22 Jul 2003 12:07:37 -0000 1.20
+++ PathFinder.h 11 Oct 2003 17:02:36 -0000 1.21
@@ -23,8 +23,8 @@
#if defined(OS_UNIX) || defined(__CYGWIN__)
/// define a delimiter for separating paths
-# define PATHFINDER_DELIMITER ":"
+# define PATHFINDER_DELIMITER _T(":")
# include <unistd.h> // for R_OK
#elif defined(OS_WIN)
-# define PATHFINDER_DELIMITER ";"
+# define PATHFINDER_DELIMITER _T(";")
# define R_OK 4 // access() mode
#endif
-------------------------------------------------------
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
