* wxMemoryStreams updates
* Various fixes about wxGTK and Unicode * Various fixes in wxStreams git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -138,7 +138,7 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption,
|
||||
{
|
||||
wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data);
|
||||
if ( dialog.ShowModal() == wxID_OK )
|
||||
return dialog.GetSelectionClientData();
|
||||
return (wxChar *)dialog.GetSelectionClientData();
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
@@ -212,10 +212,13 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
|
||||
|
||||
/* local buffer in multibyte form */
|
||||
wxString buf;
|
||||
buf << '/' << str.mb_str();
|
||||
buf << _T('/') << str.c_str();
|
||||
|
||||
char *cbuf = new char[buf.Length()];
|
||||
strcpy(cbuf, buf.mbc_str());
|
||||
|
||||
GtkItemFactoryEntry entry;
|
||||
entry.path = (gchar *)buf.c_str(); // const_cast
|
||||
entry.path = (gchar *)cbuf; // const_cast
|
||||
entry.accelerator = (gchar*) NULL;
|
||||
entry.callback = (GtkItemFactoryCallback) NULL;
|
||||
entry.callback_action = 0;
|
||||
|
@@ -390,7 +390,7 @@ void wxTextCtrl::AppendText( const wxString &text )
|
||||
m_font.GetInternalFont(),
|
||||
m_foregroundColour.GetColor(),
|
||||
m_backgroundColour.GetColor(),
|
||||
text, text.length());
|
||||
text.mbc_str(), text.length());
|
||||
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user