added wxXmString ctor from wxCStrData to fix compilation errors after c_str() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -131,16 +131,25 @@ XmString wxStringToXmString( const char* string );
|
|||||||
// cleaning up automatically)
|
// cleaning up automatically)
|
||||||
class wxXmString
|
class wxXmString
|
||||||
{
|
{
|
||||||
public:
|
void Init(const char *str)
|
||||||
wxXmString(const char* str)
|
|
||||||
{
|
{
|
||||||
m_string = XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
|
m_string = XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
wxXmString(const char* str)
|
||||||
|
{
|
||||||
|
Init(str);
|
||||||
|
}
|
||||||
|
|
||||||
wxXmString(const wxString& str)
|
wxXmString(const wxString& str)
|
||||||
{
|
{
|
||||||
m_string = XmStringCreateLtoR((char *)str.mb_str(),
|
Init(str.mb_str());
|
||||||
XmSTRING_DEFAULT_CHARSET);
|
}
|
||||||
|
|
||||||
|
wxXmString(const wxCStrData& str)
|
||||||
|
{
|
||||||
|
Init(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
// just to avoid calling XmStringFree()
|
// just to avoid calling XmStringFree()
|
||||||
|
Reference in New Issue
Block a user