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

applied patch 1223806 : unicode for tabs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-07-31 17:54:58 +00:00
parent 8fc754bf2b
commit 5324268eab
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/carbon/notebmac.cpp
View File

@@ -337,17 +337,17 @@ void wxNotebook::MacSetupTabs()
m_peer->SetMaximum( GetPageCount() ) ; m_peer->SetMaximum( GetPageCount() ) ;
wxNotebookPage *page; wxNotebookPage *page;
ControlTabInfoRec info; ControlTabInfoRecV1 info;
const size_t countPages = GetPageCount(); const size_t countPages = GetPageCount();
for(size_t ii = 0; ii < countPages; ii++) for(size_t ii = 0; ii < countPages; ii++)
{ {
page = m_pages[ii]; page = m_pages[ii];
info.version = 0; info.version = kControlTabInfoVersionOne;
info.iconSuiteID = 0; info.iconSuiteID = 0;
wxMacStringToPascal( page->GetLabel() , info.name ) ; wxMacCFStringHolder cflabel( page->GetLabel() , m_font.GetEncoding() ) ;
m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ; info.name = cflabel ;
m_peer->SetTabEnabled( ii + 1 , true ) ; m_peer->SetData<ControlTabInfoRecV1>( ii+1, kControlTabInfoTag, &info ) ;
if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
{ {
@@ -362,7 +362,7 @@ void wxNotebook::MacSetupTabs()
wxMacReleaseBitmapButton( &info ) ; wxMacReleaseBitmapButton( &info ) ;
} }
} }
m_peer->SetTabEnabled( ii + 1 , true ) ;
} }
Rect bounds; Rect bounds;
m_peer->GetRectInWindowCoords( &bounds ) ; m_peer->GetRectInWindowCoords( &bounds ) ;