Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv11325/src/modules

Modified Files:
        HtmlViewer.cpp 
Log Message:
initial checkin of UTF-7 support

Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- HtmlViewer.cpp      15 Feb 2002 18:05:29 -0000      1.29
+++ HtmlViewer.cpp      16 Apr 2002 02:45:53 -0000      1.30
@@ -760,14 +760,5 @@
       // convert from UTF-8 to environment's default encoding
       // FIXME it won't be needed when full Unicode support is available
-      wxString htmlTextOrig = m_htmlText;
-      m_htmlText = wxString(htmlTextOrig.wc_str(wxConvUTF8), wxConvLocal);
-      if ( m_htmlText.Length() == 0 )
-      {
-         // conversion failed - use original text (and display
-         // incorrectly, unfortunately)
-         m_htmlText = htmlTextOrig;
-         wxLogDebug("conversion from UTF-8 to environment's default encoding failed");
-      }
-      encHeader = wxLocale::GetSystemEncoding();
+      encHeader = ConvertUnicodeToSystem(&m_htmlText);
    }
 


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to