SF.net SVN: mahogany: [7231] trunk/M/src

Revision: 7231
          http://svn.sourceforge.net/mahogany/?rev=7231&view=rev
Author:   vadz
Date:     2007-04-03 07:10:14 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
fix operator?: involving strings to compile with both wx HEAD and 2.8

Modified Paths:
--------------
    trunk/M/src/classes/MessageView.cpp
    trunk/M/src/gui/wxFolderView.cpp
    trunk/M/src/mail/MFui.cpp

Modified: trunk/M/src/classes/MessageView.cpp
===================================================================
--- trunk/M/src/classes/MessageView.cpp	2007-04-03 13:43:51 UTC (rev 7230)
+++ trunk/M/src/classes/MessageView.cpp	2007-04-03 14:10:14 UTC (rev 7231)
@@ -3553,7 +3553,7 @@
                 "more than the current threshold of %d Kbytes.\n"
                 "\n"
                 "Do you still want to download it?"),
-              part ? _(" part") : wxString(), size, maxSize);
+              part ? _(" part") : "", size, maxSize);
 
    return MDialog_YesNoDialog(msg, GetParentFrame());
 }

Modified: trunk/M/src/gui/wxFolderView.cpp
===================================================================
--- trunk/M/src/gui/wxFolderView.cpp	2007-04-03 13:43:51 UTC (rev 7230)
+++ trunk/M/src/gui/wxFolderView.cpp	2007-04-03 14:10:14 UTC (rev 7231)
@@ -2714,7 +2714,7 @@
 {
    wxLogStatus(GetFrame(this), _("Now sorting by %s%s"),
                GetColumnName(col).Lower().c_str(),
-               reverse ? _(" (reverse)") : wxString());
+               reverse ? _(" (reverse)") : "");
 
    profile->writeEntry(MP_MSGS_SORTBY, sortOrder);
 

Modified: trunk/M/src/mail/MFui.cpp
===================================================================
--- trunk/M/src/mail/MFui.cpp	2007-04-03 13:43:51 UTC (rev 7230)
+++ trunk/M/src/mail/MFui.cpp	2007-04-03 14:10:14 UTC (rev 7231)
@@ -80,7 +80,7 @@
          break;
 
       case MessageSize_Bytes:
-         s.Printf(_("%lu%s"), sizeBytes, terse ? wxString() : _(" bytes"));
+         s.Printf(_("%lu%s"), sizeBytes, terse ? "" : _(" bytes"));
          break;
 
       case MessageSize_KBytes:


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