X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21fd55291b631eae9ccfd78866616aca6e573ebe..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/notebmac.cpp?ds=sidebyside

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 4867e34272..3bc3131591 100644
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "notebook.h"
 #endif
 
@@ -20,6 +20,10 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+#include "wx/wxprec.h"
+
+#if wxUSE_NOTEBOOK
+
 #include "wx/app.h"
 #include "wx/string.h"
 #include "wx/log.h"
@@ -125,9 +129,9 @@ bool wxNotebook::Create(wxWindow *parent,
             tabsize = kControlSizeSmall; 
     }
 
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
-     tabsize , tabstyle, 0, NULL,  *m_peer ) );
+     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
     
     
     MacPostControlCreate(pos,size) ;
@@ -163,34 +167,6 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
     return DoGetSizeFromClientSize( sizePage ) ;
 }
 
-wxSize wxNotebook::DoGetBestSize() const
-{
-    // calculate the max page size
-    wxSize size(0, 0);
-
-    size_t count = GetPageCount();
-    if ( count )
-    {
-        for ( size_t n = 0; n < count; n++ )
-        {
-            wxSize sizePage = m_pages[n]->GetSize();
-
-            if ( size.x < sizePage.x )
-                size.x = sizePage.x;
-            if ( size.y < sizePage.y )
-                size.y = sizePage.y;
-        }
-    }
-    else // no pages
-    {
-        // use some arbitrary default size
-        size.x =
-        size.y = 100;
-    }
-
-    return CalcSizeFromPage(size);
-}
-
 int wxNotebook::SetSelection(size_t nPage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
@@ -279,6 +255,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
     if(m_nSelection >= 0) {
         m_pages[m_nSelection]->Show(true);
     }
+    InvalidateBestSize();
     return page;
 }
 
@@ -288,6 +265,7 @@ bool wxNotebook::DeleteAllPages()
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;
+    InvalidateBestSize();
     return TRUE;
 }
 
@@ -331,7 +309,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     {
         m_nSelection++;
         // while this still is the same page showing, we need to update the tabs
-        SetControl32BitValue( *m_peer , m_nSelection + 1 ) ;
+        m_peer->SetValue( m_nSelection + 1 ) ;
     }
     
     // some page should be selected: either this one or the first one if there
@@ -345,6 +323,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( selNew != -1 )
         SetSelection(selNew);
 
+    InvalidateBestSize();
     return true;
 }
 
@@ -355,7 +334,7 @@ bool wxNotebook::InsertPage(size_t nPage,
 */
 void wxNotebook::MacSetupTabs()
 {
-    SetControl32BitMaximum( *m_peer , GetPageCount() ) ;
+    m_peer->SetMaximum( GetPageCount() ) ;
 
     wxNotebookPage *page;
     ControlTabInfoRec info;
@@ -367,54 +346,26 @@ void wxNotebook::MacSetupTabs()
         info.version = 0;
         info.iconSuiteID = 0;
         wxMacStringToPascal( page->GetLabel() , info.name ) ;
+        m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
+        m_peer->SetTabEnabled( ii + 1 , true ) ;
 
-        SetControlData( *m_peer, ii+1, kControlTabInfoTag,
-            sizeof( ControlTabInfoRec) , (char*) &info ) ;
-        SetTabEnabled( *m_peer , ii+1 , true ) ;
-#if TARGET_CARBON
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
-            // tab controls only support very specific types of images, therefore we are doing an odyssee
-            // accross the icon worlds (even Apple DTS did not find a shorter path)
-            // in order not to pollute the icon registry we put every icon into (OSType) 1 and immediately
-            // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we
-            // unregister it) in case this will ever lead to having the same icon everywhere add some kind
-            // of static counter
-            const wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
-            if ( bmap )
+            const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
+            if ( bmap.Ok() )
             {
-                wxBitmap scaledBitmap ;
-                if ( bmap->GetWidth() != 16 || bmap->GetHeight() != 16 )
-                {
-                    scaledBitmap = wxBitmap( bmap->ConvertToImage().Scale(16,16) ) ;
-                    bmap = &scaledBitmap ;
-                }
                 ControlButtonContentInfo info ;
-                wxMacCreateBitmapButton( &info , *bmap , kControlContentPictHandle) ;
-                IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ;
-                OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
-                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-                IconRef iconRef ;
-                err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1, iconFamily, &iconRef ) ;
-                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-                info.contentType = kControlContentIconRef ;
-                info.u.iconRef = iconRef ;
-                SetControlData( *m_peer, ii+1,kControlTabImageContentTag,
-                    sizeof( info ), (Ptr)&info );
+
+                wxMacCreateBitmapButton( &info , bmap ) ;
+                OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
-                if ( UMAGetSystemVersion() < 0x1030 )
-                {              	
-                	UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
-                }
-       
-                ReleaseIconRef( iconRef ) ;
-                DisposeHandle( (Handle) iconFamily ) ;
+                wxMacReleaseBitmapButton( &info ) ;
             }
         }
-#endif
+
     }
     Rect bounds;
-    UMAGetControlBoundsInWindowCoords(*m_peer, &bounds);
+    m_peer->GetRectInWindowCoords( &bounds ) ;
     InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
 }
 
@@ -566,14 +517,14 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     }
     
     m_nSelection = nSel;
-    SetControl32BitValue( *m_peer , m_nSelection + 1 ) ;
+    m_peer->SetValue( m_nSelection + 1 ) ;
 }
 
 wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     OSStatus status = eventNotHandledErr ;
     
-    SInt32 newSel = GetControl32BitValue( *m_peer ) - 1 ;
+    SInt32 newSel = m_peer->GetValue() - 1 ;
     if ( newSel != m_nSelection )
     {
         wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
@@ -591,10 +542,12 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
         }
         else
         {
-            SetControl32BitValue( *m_peer , m_nSelection + 1 ) ;
+            m_peer->SetValue( m_nSelection + 1 ) ;
         }
         status = noErr ;
     }
     return status ;
 }
 
+#endif
+