From 5324268eab589ae6e6de0b9bb97a4e2b6cedaf70 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 31 Jul 2005 17:54:58 +0000 Subject: [PATCH 1/1] applied patch 1223806 : unicode for tabs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/notebmac.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 3bc3131591..e32c7b02ea 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -337,17 +337,17 @@ void wxNotebook::MacSetupTabs() m_peer->SetMaximum( GetPageCount() ) ; wxNotebookPage *page; - ControlTabInfoRec info; + ControlTabInfoRecV1 info; const size_t countPages = GetPageCount(); for(size_t ii = 0; ii < countPages; ii++) { page = m_pages[ii]; - info.version = 0; + info.version = kControlTabInfoVersionOne; info.iconSuiteID = 0; - wxMacStringToPascal( page->GetLabel() , info.name ) ; - m_peer->SetData( ii+1, kControlTabInfoTag, &info ) ; - m_peer->SetTabEnabled( ii + 1 , true ) ; + wxMacCFStringHolder cflabel( page->GetLabel() , m_font.GetEncoding() ) ; + info.name = cflabel ; + m_peer->SetData( ii+1, kControlTabInfoTag, &info ) ; if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) { @@ -362,7 +362,7 @@ void wxNotebook::MacSetupTabs() wxMacReleaseBitmapButton( &info ) ; } } - + m_peer->SetTabEnabled( ii + 1 , true ) ; } Rect bounds; m_peer->GetRectInWindowCoords( &bounds ) ; -- 2.45.2