Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv15681/include

Modified Files:
        MessageView.h strutil.h 
Log Message:
repackaged Nerijus' changes in a cleaner way


Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- MessageView.h       16 Apr 2002 16:03:14 -0000      1.29
+++ MessageView.h       16 Apr 2002 19:15:32 -0000      1.30
@@ -680,8 +680,3 @@
                                          UIdType uid);
 
-/// try to convert text in UTF-8 or 7 to the current encoding in place
-/// returns wxLocale::GetSystemEncoding()
-extern wxFontEncoding ConvertUnicodeToSystem(wxString *strUtf,
-                                             bool isUTF7 = false);
-
 #endif // MESSAGEVIEW_H

Index: strutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/strutil.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -b -u -2 -r1.54 -r1.55
--- strutil.h   19 Dec 2001 12:56:56 -0000      1.54
+++ strutil.h   16 Apr 2002 19:15:32 -0000      1.55
@@ -376,4 +376,16 @@
 extern wxArrayString strutil_uniq_array(const wxSortedArrayString& arrSorted);
 
+/**
+  Try to convert text in UTF-8 or 7 to the current encoding (the conversion is
+  done in place)
+
+  @param strUtf string containing UTF text on input, ASCII text on output
+  @param utfEnc specifies if it is in UTF-7 or UTF-8
+  @return the encoding of the returned string
+ */
+extern wxFontEncoding
+ConvertUnicodeToSystem(wxString *strUtf,
+                       wxFontEncoding utfEnc = wxFONTENCODING_UTF8);
+
 //@}
 #endif


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

Reply via email to