remove some unnecessary c_str() calls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index 5d608029045668ee48e83114ac1170a105f51768..4c0d97ba34a4967fa548ddf0b0d559188c88bfef 100644 (file)
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -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;
 }

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 4d53edd850a798c0fa19503f2ee980843861d62e..120630a0ea2b1a6e4dd3be780af1dcdeaf45f5b8 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -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)

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index fefda2bd809223ea5f20c7d8b5876c72c6315382..bfe8e9c0764655a86fcfe55b1af13375c73cacb9 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -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
     {