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:
@@ -923,7 +923,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
|
||||
return;
|
||||
|
||||
wxTreeViewItem tvItem(item, TVIF_TEXT);
|
||||
tvItem.pszText = (wxChar *)text.c_str(); // conversion is ok
|
||||
tvItem.pszText = (wxChar *)text.wx_str(); // conversion is ok
|
||||
DoSetItem(&tvItem);
|
||||
|
||||
// when setting the text of the item being edited, the text control should
|
||||
@@ -1434,7 +1434,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
|
||||
if ( !text.empty() )
|
||||
{
|
||||
mask |= TVIF_TEXT;
|
||||
tvIns.item.pszText = (wxChar *)text.c_str(); // cast is ok
|
||||
tvIns.item.pszText = (wxChar *)text.wx_str(); // cast is ok
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user