first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*) 2. added template type-safe wrappers for vararg functions 3. added wxUniChar class representing single Unicode character 4. changed wxString::operator[] and wxString::iterator to return wxUniChar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -291,7 +291,7 @@ void wxToolTip::Add(WXHWND hWnd)
|
||||
// NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
|
||||
// of any length
|
||||
ti.hwnd = hwnd;
|
||||
ti.lpszText = (wxChar *)m_text.c_str(); // const_cast
|
||||
ti.lpszText = (wxChar *)m_text.wx_str(); // const_cast
|
||||
|
||||
if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
|
||||
{
|
||||
@@ -360,7 +360,7 @@ void wxToolTip::Add(WXHWND hWnd)
|
||||
// replace the '\n's with spaces because otherwise they appear as
|
||||
// unprintable characters in the tooltip string
|
||||
m_text.Replace(_T("\n"), _T(" "));
|
||||
ti.lpszText = (wxChar *)m_text.c_str(); // const_cast
|
||||
ti.lpszText = (wxChar *)m_text.wx_str(); // const_cast
|
||||
|
||||
if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
|
||||
{
|
||||
@@ -434,7 +434,7 @@ void wxToolTip::SetTip(const wxString& tip)
|
||||
{
|
||||
// update the tip text shown by the control
|
||||
wxToolInfo ti(GetHwndOf(m_window));
|
||||
ti.lpszText = (wxChar *)m_text.c_str();
|
||||
ti.lpszText = (wxChar *)m_text.wx_str();
|
||||
|
||||
(void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
|
||||
}
|
||||
|
Reference in New Issue
Block a user