remove some unnecessary c_str() calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e2cb99c856
commit
f069ac4801
@ -47,7 +47,7 @@ wxString wxGtkFileChooser::GetPath() const
|
||||
wxGtkString str( gtk_file_chooser_get_filename( m_widget ) );
|
||||
|
||||
wxString string;
|
||||
if (str.c_str() != NULL)
|
||||
if (str)
|
||||
string = wxString::FromUTF8(str);
|
||||
return string;
|
||||
}
|
||||
|
@ -207,7 +207,7 @@ void wxTaskBarIcon::Private::SetIcon()
|
||||
#if wxUSE_TOOLTIPS
|
||||
const char *tip_text = NULL;
|
||||
if (!m_tipText.empty())
|
||||
tip_text = m_tipText.c_str();
|
||||
tip_text = m_tipText;
|
||||
|
||||
#if GTK_CHECK_VERSION(2,10,0)
|
||||
if (m_statusIcon)
|
||||
|
@ -122,7 +122,7 @@ wxConvertToGTK(const wxString& s, wxFontEncoding enc)
|
||||
wxWCharBuffer wbuf;
|
||||
if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
|
||||
{
|
||||
wbuf = wxConvUI->cMB2WC(s.c_str());
|
||||
wbuf = wxConvUI->cMB2WC(s);
|
||||
}
|
||||
else // another encoding, use generic conversion class
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user