Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv21757/include
Modified Files:
MessageView.h
Log Message:
don't put static functions in headers
Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- MessageView.h 16 Apr 2002 12:15:08 -0000 1.27
+++ MessageView.h 16 Apr 2002 13:44:27 -0000 1.28
@@ -672,5 +672,5 @@
// ----------------------------------------------------------------------------
-// global functions
+// global functions (implemented in gui/wxMessageView.cpp)
// ----------------------------------------------------------------------------
@@ -680,36 +680,6 @@
UIdType uid);
-// convert a string in UTF-8 into the string in the current encoding: of
-// course, this doesn't work in general as Unicode is not representable as an 8
-// bit charset but it works in some common cases and is better than no UTF-8
-// support at all
-//
-// FIXME this won't be needed when full Unicode support is available
-static wxFontEncoding ConvertUnicodeToSystem(wxString *strUtf)
-{
- CHECK( strUtf, wxFONTENCODING_SYSTEM,
- "NULL string in ConvertUnicodeToSystem" );
-
- if ( !strUtf->empty() )
- {
- wxString str(strUtf->wc_str(wxConvUTF8), wxConvLocal);
- if ( str.empty() )
- {
- // conversion failed - use original text (and display incorrectly,
- // unfortunately)
- wxLogDebug("conversion from UTF-8 to default encoding failed");
- }
- else
- {
- *strUtf = str;
- }
- }
-
-#if wxUSE_INTL
- return wxLocale::GetSystemEncoding();
-#else // !wxUSE_INTL
- return wxFONTENCODING_ISO8859_1;
-#endif // wxUSE_INTL/!wxUSE_INTL
-}
+/// try to convert text in UTF-8 to the current encoding in place
+extern wxFontEncoding ConvertUnicodeToSystem(wxString *strUtf);
#endif // MESSAGEVIEW_H
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
