compilation fix after c_str() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -138,11 +138,12 @@ wxString wxComboBox::GetValue() const
|
|||||||
|
|
||||||
void wxComboBox::SetValue(const wxString& value)
|
void wxComboBox::SetValue(const wxString& value)
|
||||||
{
|
{
|
||||||
m_inSetValue = true;
|
|
||||||
if( !value.empty() )
|
if( !value.empty() )
|
||||||
XmComboBoxSetString( (Widget)m_mainWidget,
|
{
|
||||||
wxConstCast(value.c_str(), char) );
|
m_inSetValue = true;
|
||||||
m_inSetValue = false;
|
XmComboBoxSetString((Widget)m_mainWidget, value.char_str());
|
||||||
|
m_inSetValue = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))
|
void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))
|
||||||
@@ -289,7 +290,7 @@ void wxComboBox::Replace(long from, long to, const wxString& value)
|
|||||||
{
|
{
|
||||||
XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
|
XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
|
||||||
(XmTextPosition) to,
|
(XmTextPosition) to,
|
||||||
wxConstCast(value.c_str(), char));
|
value.char_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxComboBox::Remove(long from, long to)
|
void wxComboBox::Remove(long from, long to)
|
||||||
|
Reference in New Issue
Block a user