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:
@@ -3040,7 +3040,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
|
||||
else
|
||||
{
|
||||
// pszText is not const, hence the cast
|
||||
lvItem.pszText = (wxChar *)info.m_text.c_str();
|
||||
lvItem.pszText = (wxChar *)info.m_text.wx_str();
|
||||
if ( lvItem.pszText )
|
||||
lvItem.cchTextMax = info.m_text.length();
|
||||
else
|
||||
@@ -3061,7 +3061,7 @@ static void wxConvertToMSWListCol(HWND hwndList,
|
||||
if ( item.m_mask & wxLIST_MASK_TEXT )
|
||||
{
|
||||
lvCol.mask |= LVCF_TEXT;
|
||||
lvCol.pszText = (wxChar *)item.m_text.c_str(); // cast is safe
|
||||
lvCol.pszText = (wxChar *)item.m_text.wx_str(); // cast is safe
|
||||
}
|
||||
|
||||
if ( item.m_mask & wxLIST_MASK_FORMAT )
|
||||
|
Reference in New Issue
Block a user