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:
@@ -505,7 +505,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
|
||||
|
||||
TC_ITEM tcItem;
|
||||
tcItem.mask = TCIF_TEXT;
|
||||
tcItem.pszText = (wxChar *)strText.c_str();
|
||||
tcItem.pszText = (wxChar *)strText.wx_str();
|
||||
|
||||
if ( !HasFlag(wxNB_MULTILINE) )
|
||||
return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;
|
||||
@@ -773,7 +773,7 @@ bool wxNotebook::InsertPage(size_t nPage,
|
||||
if ( !strText.empty() )
|
||||
{
|
||||
tcItem.mask |= TCIF_TEXT;
|
||||
tcItem.pszText = (wxChar *)strText.c_str(); // const_cast
|
||||
tcItem.pszText = (wxChar *)strText.wx_str(); // const_cast
|
||||
}
|
||||
|
||||
// hide the page: unless it is selected, it shouldn't be shown (and if it
|
||||
|
Reference in New Issue
Block a user