Revision: 7220
http://svn.sourceforge.net/mahogany/?rev=7220&view=rev
Author: vadz
Date: 2007-04-02 17:09:14 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
corrections for compilation with latest wx cvs
Modified Paths:
--------------
trunk/M/src/Python/InitPython.cpp
trunk/M/src/Python/PythonHelp.cpp
trunk/M/src/adb/AdbManager.cpp
trunk/M/src/classes/MessageView.cpp
trunk/M/src/gui/wxFolderView.cpp
trunk/M/src/gui/wxMDialogs.cpp
trunk/M/src/mail/MFui.cpp
trunk/M/src/mail/MailMH.cpp
trunk/M/src/mail/MessageCC.cpp
Modified: trunk/M/src/Python/InitPython.cpp
===================================================================
--- trunk/M/src/Python/InitPython.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/Python/InitPython.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -132,7 +132,7 @@
// on some systems putenv() takes "char *", cast silents the warnings but
// should be harmless otherwise
- putenv((char *)pythonPathNew.c_str());
+ putenv((char *)pythonPathNew.mb_str());
if ( !READ_APPCONFIG(MP_USEPYTHON) )
{
Modified: trunk/M/src/Python/PythonHelp.cpp
===================================================================
--- trunk/M/src/Python/PythonHelp.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/Python/PythonHelp.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -161,7 +161,7 @@
}
// load the module containing the function
- *module = PyImport_ImportModule((char *)modname.c_str());
+ *module = PyImport_ImportModule((char *)modname.mb_str());
if ( !*module )
{
@@ -181,7 +181,7 @@
}
//else: if reloading failed, fall back to the original module
- *function = PyObject_GetAttrString(*module, (char *)functionName.c_str());
+ *function = PyObject_GetAttrString(*module, (char *)functionName.mb_str());
if ( !*function )
{
Py_XDECREF(*module);
@@ -260,20 +260,20 @@
break;
case 1:
- rc = PyObject_CallFunction(function, "s", arguments[0].c_str());
+ rc = PyObject_CallFunction(function, "s", arguments[0].mb_str());
break;
case 2:
rc = PyObject_CallFunction(function, "ss",
- arguments[0].c_str(),
- arguments[1].c_str());
+ arguments[0].mb_str(),
+ arguments[1].mb_str());
break;
case 3:
rc = PyObject_CallFunction(function, "sss",
- arguments[0].c_str(),
- arguments[1].c_str(),
- arguments[2].c_str());
+ arguments[0].mb_str(),
+ arguments[1].mb_str(),
+ arguments[2].mb_str());
break;
default:
Modified: trunk/M/src/adb/AdbManager.cpp
===================================================================
--- trunk/M/src/adb/AdbManager.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/adb/AdbManager.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -515,7 +515,7 @@
bool quoted = false;
for ( size_t n = 0; n <= len; n++ )
{
- switch ( const wxChar ch = n == len ? '\0' : text[n] )
+ switch ( const wxChar ch = n == len ? wxChar('\0') : text[n] )
{
case '"':
quoted = !quoted;
Modified: trunk/M/src/classes/MessageView.cpp
===================================================================
--- trunk/M/src/classes/MessageView.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/classes/MessageView.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -3553,7 +3553,7 @@
"more than the current threshold of %d Kbytes.\n"
"\n"
"Do you still want to download it?"),
- part ? _(" part") : wxEmptyString, size, maxSize);
+ part ? _(" part") : wxString(), size, maxSize);
return MDialog_YesNoDialog(msg, GetParentFrame());
}
Modified: trunk/M/src/gui/wxFolderView.cpp
===================================================================
--- trunk/M/src/gui/wxFolderView.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/gui/wxFolderView.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -2714,7 +2714,7 @@
{
wxLogStatus(GetFrame(this), _("Now sorting by %s%s"),
GetColumnName(col).Lower().c_str(),
- reverse ? _(" (reverse)") : wxEmptyString);
+ reverse ? _(" (reverse)") : wxString());
profile->writeEntry(MP_MSGS_SORTBY, sortOrder);
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/gui/wxMDialogs.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -630,7 +630,7 @@
return MDialog_Message(message, parent, title,
persMsg ? configPath.c_str()
- : (wxChar *)NULL, flags);
+ : (const wxChar *)NULL, flags);
}
MDlgResult MDialog_YesNoCancel(wxChar const *message,
Modified: trunk/M/src/mail/MFui.cpp
===================================================================
--- trunk/M/src/mail/MFui.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/mail/MFui.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -80,7 +80,7 @@
break;
case MessageSize_Bytes:
- s.Printf(_("%lu%s"), sizeBytes, terse ? wxEmptyString : _(" bytes"));
+ s.Printf(_("%lu%s"), sizeBytes, terse ? wxString() : _(" bytes"));
break;
case MessageSize_KBytes:
Modified: trunk/M/src/mail/MailMH.cpp
===================================================================
--- trunk/M/src/mail/MailMH.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/mail/MailMH.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -214,7 +214,7 @@
#endif // Unix/!Unix
// const_cast is harmless
- mail_parameters(NULL, SET_MHPATH, (char *)pathMH.c_str());
+ mail_parameters(NULL, SET_MHPATH, (char *)pathMH.mb_str());
}
// force cclient to init the MH driver
@@ -305,7 +305,7 @@
if ( root != InitializeMH() )
{
// const_cast is harmless
- mail_parameters(NULL, SET_MHPATH, (char *)root.c_str());
+ mail_parameters(NULL, SET_MHPATH, (char *)root.mb_str());
}
// first create the root MH folder
Modified: trunk/M/src/mail/MessageCC.cpp
===================================================================
--- trunk/M/src/mail/MessageCC.cpp 2007-04-02 16:23:06 UTC (rev 7219)
+++ trunk/M/src/mail/MessageCC.cpp 2007-04-03 00:09:14 UTC (rev 7220)
@@ -699,7 +699,7 @@
unsigned long len = 0;
// NB: this pointer shouldn't be freed
- char *cptr = (*fetchFunc)(stream, m_uid, (char *)sp.c_str(), &len, FT_UID);
+ char *cptr = (*fetchFunc)(stream, m_uid, (char *)sp.mb_str(), &len, FT_UID);
m_folder->EndReading();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.