Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21294/src/gui
Modified Files:
wxlparser.cpp
Log Message:
removed UTF-8 parsing from viewers, as it started to work in MessageView.cpp after
commenting out check for EnsureAvailableTextEncoding
Index: wxlparser.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlparser.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -u -2 -r1.51 -r1.52
--- wxlparser.cpp 16 Apr 2002 19:15:34 -0000 1.51
+++ wxlparser.cpp 16 Apr 2002 19:32:15 -0000 1.52
@@ -19,8 +19,4 @@
#include "Mpch.h"
-#ifndef USE_PCH
-# include "strutil.h" // for ConvertUnicodeToSystem()
-#endif
-
#include "gui/wxllist.h"
#include "gui/wxlparser.h"
@@ -176,17 +172,9 @@
void wxLayoutImportText(wxLayoutList *list,
- const wxString& strOrig,
+ const wxString& str,
wxFontEncoding encoding)
{
- if ( strOrig.empty() )
+ if ( str.empty() )
return;
-
- wxString str = strOrig;
-
- if ( encoding == wxFONTENCODING_UTF8 || encoding == wxFONTENCODING_UTF7 )
- {
- // Convert from UTF-8|7 to environment's default encoding
- encoding = ConvertUnicodeToSystem(&str, encoding);
- }
bool useConverter = FALSE;
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
