Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv12564/src/classes
Modified Files:
MApplication.cpp MessageView.cpp XFace.cpp
Log Message:
unicode fixes
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.280
retrieving revision 1.281
diff -b -u -2 -r1.280 -r1.281
--- MApplication.cpp 27 Sep 2003 23:13:26 -0000 1.280
+++ MApplication.cpp 12 Oct 2003 01:41:21 -0000 1.281
@@ -281,7 +281,7 @@
if ( !READ_APPCONFIG(MP_DONTOPENSTARTUP) )
{
- char *folders = strutil_strdup(READ_APPCONFIG(MP_OPENFOLDERS));
+ wxChar *folders = strutil_strdup(READ_APPCONFIG(MP_OPENFOLDERS));
kbStringList openFoldersList;
- strutil_tokenise(folders,";",openFoldersList);
+ strutil_tokenise(folders, _T(";"), openFoldersList);
delete [] folders;
@@ -518,6 +518,6 @@
wxLog::FlushActive();
- static const char *msg =
- "Detected a possible problem with your Python installation.\n"
+ static const wxChar *msg =
+ _T("Detected a possible problem with your Python installation.\n"
"A properly installed Python system is required for using\n"
"M's scripting capabilities. Some minor functionality might\n"
@@ -525,5 +525,5 @@
"unaffected.\n"
"Would you like to disable Python support for now?\n"
- "(You can re-enable it later from the options dialog)";
+ "(You can re-enable it later from the options dialog)");
if ( MDialog_YesNoDialog(_(msg)) )
{
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -b -u -2 -r1.140 -r1.141
--- MessageView.cpp 11 Oct 2003 20:23:48 -0000 1.140
+++ MessageView.cpp 12 Oct 2003 01:41:21 -0000 1.141
@@ -2504,7 +2504,7 @@
{
kbStringList faxdomains;
- char *faxlisting = strutil_strdup(READ_CONFIG(profile,
+ wxChar *faxlisting = strutil_strdup(READ_CONFIG(profile,
MP_INCFAX_DOMAINS));
- strutil_tokenise(faxlisting, ":;,", faxdomains);
+ strutil_tokenise(faxlisting, _T(":;,"), faxdomains);
delete [] faxlisting;
bool isfax = false;
Index: XFace.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/XFace.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -u -2 -r1.30 -r1.31
--- XFace.cpp 11 Oct 2003 20:23:48 -0000 1.30
+++ XFace.cpp 12 Oct 2003 01:41:21 -0000 1.31
@@ -77,5 +77,5 @@
String out = strutil_enforceCRLF(wxConvertMB2WX(xface));
delete [] xface;
- xface = strutil_strdup(out);
+ xface = strutil_strdup(wxConvertWX2MB(out));
initialised = true;
return true;
@@ -338,5 +338,5 @@
String out = strutil_enforceCRLF(wxConvertMB2WX(xface));
delete [] xface;
- xface = strutil_strdup(out);
+ xface = strutil_strdup(wxConvertWX2MB(out));
initialised = true;
return true;
@@ -508,5 +508,5 @@
}
}
- (*xpm)[line++] = strutil_strdup(tmp);
+ (*xpm)[line++] = strutil_strdup(wxConvertWX2MB(tmp));
}
delete [] buf;
-------------------------------------------------------
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
