SF.net SVN: mahogany: [7198] trunk/M/src/util/strutil.cpp

Revision: 7198
          http://svn.sourceforge.net/mahogany/?rev=7198&view=rev
Author:   vadz
Date:     2006-12-25 17:25:10 -0800 (Mon, 25 Dec 2006)

Log Message:
-----------
compilation fix for GTK+ 2 build after last change

Modified Paths:
--------------
    trunk/M/src/util/strutil.cpp

Modified: trunk/M/src/util/strutil.cpp
===================================================================
--- trunk/M/src/util/strutil.cpp	2006-12-25 21:42:25 UTC (rev 7197)
+++ trunk/M/src/util/strutil.cpp	2006-12-26 01:25:10 UTC (rev 7198)
@@ -1546,9 +1546,17 @@
    {
       if ( enc == wxFONTENCODING_UTF7 )
       {
+#ifdef __WXGTK20__
+         // with GTK+ 2.0 we can convert everything to Unicode
+         encConv = wxFONTENCODING_SYSTEM;
+         wxWCharBuffer wbuf(strUtf->wc_str(wxConvUTF7));
+         if ( wbuf )
+            *strUtf = wxConvUTF8.cWC2MB(wbuf);
+#else
          encConv = ConvertToMB(strUtf, wxConvUTF7);
+#endif
       }
-      else
+      else // !UTF-7
       {
          ASSERT_MSG( enc == wxFONTENCODING_UTF8, _T("unknown Unicode encoding") );
 
@@ -1557,7 +1565,7 @@
          encConv = wxFONTENCODING_SYSTEM;
 #else
          return ConvertToMB(strUtf, wxConvUTF8);
-#endif // !__WXGTK20__
+#endif
       }
    }
    else // doesn't really matter what we return from here


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