fixed wxMotif to compile in Unicode mode (this is not full Unicode support, all strings must be representable in current locale's charset, similarly to MSLU)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,8 +128,11 @@ extern XColor itemColors[5] ;
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxString wxXmStringToString( const XmString& xmString );
|
||||
XmString wxStringToXmString( const wxString& string );
|
||||
XmString wxStringToXmString( const char* string );
|
||||
inline XmString wxStringToXmString( const wxCharBuffer& string )
|
||||
{ return wxStringToXmString(string.data()); }
|
||||
inline XmString wxStringToXmString( const wxString& string )
|
||||
{ return wxStringToXmString((const char*)string.mb_str()); }
|
||||
|
||||
// XmString made easy to use in wxWidgets (and has an added benefit of
|
||||
// cleaning up automatically)
|
||||
@@ -146,6 +149,11 @@ public:
|
||||
Init(str);
|
||||
}
|
||||
|
||||
wxXmString(const wchar_t* str)
|
||||
{
|
||||
Init(wxConvLibc.cWC2MB(str));
|
||||
}
|
||||
|
||||
wxXmString(const wxString& str)
|
||||
{
|
||||
Init(str.mb_str());
|
||||
|
Reference in New Issue
Block a user