Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised...

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 3bc3131591cd8c628bc76ca380797a87b5100c7b..c8b4969a43fc52dbd43e8f79fc3f1b7e19b2d207 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-
 // ============================================================================
 // declarations
 // ============================================================================
@@ -337,17 +333,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<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 )
         {
@@ -357,12 +353,15 @@ void wxNotebook::MacSetupTabs()
                 ControlButtonContentInfo info ;
 
                 wxMacCreateBitmapButton( &info , bmap ) ;
-                OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
+#ifdef __WXDEBUG__
+                OSStatus err =
+#endif // __WXDEBUG__
+                    m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 wxMacReleaseBitmapButton( &info ) ;
             }
         }
-
+        m_peer->SetTabEnabled( ii + 1 , true ) ;
     }
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;