Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation in wxUSE_STL=1 build after r71467.

Browse Source 
Restore explicit conversion of wxString to char*, there is no implicit
conversion in wxUSE_STL build.

Use utf8_str() instead of c_str() removed by r71467 however as this is what we
need for wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-19 16:49:07 +00:00
parent a9946c4e6b
commit c3b0697e28
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/taskbar.cpp
View File

@@ -207,7 +207,7 @@ void wxTaskBarIcon::Private::SetIcon()
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
const char *tip_text = NULL; const char *tip_text = NULL;
if (!m_tipText.empty()) if (!m_tipText.empty())
tip_text = m_tipText; tip_text = m_tipText.utf8_str();
#if GTK_CHECK_VERSION(2,10,0) #if GTK_CHECK_VERSION(2,10,0)
if (m_statusIcon) if (m_statusIcon)