Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/classic/notebmac.cpp b/src/mac/classic/notebmac.cpp
index dadb900f3c1322c6481a971a12f6b231e233a053..b7664be30d70a7161e92025484fc2b3ae98fb1cf 100644 (file)
--- a/src/mac/classic/notebmac.cpp
+++ b/src/mac/classic/notebmac.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -195,7 +195,7 @@ bool wxNotebook::Create(wxWindow *parent,
         tabstyle = kControlTabSmallSouthProc ;
 
 
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
         tabstyle , (long) this ) ;
 
     MacPostControlCreate() ;
@@ -353,6 +353,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
     if(m_nSelection >= 0) {
         m_pages[m_nSelection]->Show(true);
     }
+    InvalidateBestSize();
     return page;
 }
 
@@ -362,6 +363,7 @@ bool wxNotebook::DeleteAllPages()
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;
+    InvalidateBestSize();
     return TRUE;
 }
 
@@ -419,6 +421,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( selNew != -1 )
         SetSelection(selNew);
 
+    InvalidateBestSize();
     return true;
 }
 
@@ -454,7 +457,7 @@ void wxNotebook::MacSetupTabs()
             // 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 ) ) ;
+            const wxBitmap* bmap = GetImageList()->GetBitmapPtr( GetPageImage(ii ) ) ;
             if ( bmap )
             {
                 wxBitmap scaledBitmap ;