replaced annoying wxLogDebug()s with wxLogTrace()

[wxWidgets.git] / src / mac / carbon / notebmac.cpp

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 3bc3131591cd8c628bc76ca380797a87b5100c7b..e32c7b02ea2a84835074906029c3d837062fa40c 100644 (file)
--- 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;
     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];
 
     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;
         info.iconSuiteID = 0;

-        wxMacStringToPascal( page->GetLabel() , info.name ) ;
-        m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
-        m_peer->SetTabEnabled( ii + 1 , true ) ;
+        wxMacCFStringHolder cflabel( page->GetLabel() , m_font.GetEncoding() ) ;
+        info.name = cflabel ;
+        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;
     m_peer->GetRectInWindowCoords( &bounds ) ;
     }
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;