Began work on print dialogs. Now wxPrintDialog

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 6dfa28f1f1c846e1b2e65ff7b96cf58f7244993e..db806ca7e6fccff3bf4dce97ddf449a9243b8250 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -125,8 +125,10 @@ bool wxNotebook::Create(wxWindow *parent,
             tabsize = kControlSizeSmall; 
     }
 
             tabsize = kControlSizeSmall; 
     }
 

+    m_peer = new wxMacControl() ;

     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,

-     tabsize , tabstyle, 0, NULL, (ControlRef*) &m_macControl) ); 
+     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
+    

     
     MacPostControlCreate(pos,size) ;
     return TRUE ;
     
     MacPostControlCreate(pos,size) ;
     return TRUE ;


@@ -277,6 +279,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
     if(m_nSelection >= 0) {
         m_pages[m_nSelection]->Show(true);
     }
     if(m_nSelection >= 0) {
         m_pages[m_nSelection]->Show(true);
     }

+    InvalidateBestSize();

     return page;
 }
 
     return page;
 }
 


@@ -286,6 +289,7 @@ bool wxNotebook::DeleteAllPages()
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;

+    InvalidateBestSize();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -329,7 +333,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     {
         m_nSelection++;
         // while this still is the same page showing, we need to update the tabs
     {
         m_nSelection++;
         // while this still is the same page showing, we need to update the tabs

-        SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ;
+        m_peer->SetValue( m_nSelection + 1 ) ;

     }
     
     // some page should be selected: either this one or the first one if there
     }
     
     // some page should be selected: either this one or the first one if there


@@ -343,17 +347,18 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( selNew != -1 )
         SetSelection(selNew);
 
     if ( selNew != -1 )
         SetSelection(selNew);
 

+    InvalidateBestSize();

     return true;
 }
 
 /* Added by Mark Newsam
 * When a page is added or deleted to the notebook this function updates
     return true;
 }
 
 /* Added by Mark Newsam
 * When a page is added or deleted to the notebook this function updates

-* information held in the m_macControl so that it matches the order
+* information held in the control so that it matches the order

 * the user would expect.
 */
 void wxNotebook::MacSetupTabs()
 {
 * the user would expect.
 */
 void wxNotebook::MacSetupTabs()
 {

-    SetControl32BitMaximum( (ControlRef) m_macControl , GetPageCount() ) ;
+    m_peer->SetMaximum( GetPageCount() ) ;

 
     wxNotebookPage *page;
     ControlTabInfoRec info;
 
     wxNotebookPage *page;
     ControlTabInfoRec info;


@@ -365,10 +370,8 @@ void wxNotebook::MacSetupTabs()
         info.version = 0;
         info.iconSuiteID = 0;
         wxMacStringToPascal( page->GetLabel() , info.name ) ;
         info.version = 0;
         info.iconSuiteID = 0;
         wxMacStringToPascal( page->GetLabel() , info.name ) ;

-
-        SetControlData( (ControlRef) m_macControl, ii+1, kControlTabInfoTag,
-            sizeof( ControlTabInfoRec) , (char*) &info ) ;
-        SetTabEnabled( (ControlRef) m_macControl , ii+1 , true ) ;
+        m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
+        m_peer->SetTabEnabled( ii + 1 , true ) ;

 #if TARGET_CARBON
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
 #if TARGET_CARBON
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {


@@ -397,8 +400,7 @@ void wxNotebook::MacSetupTabs()
                 wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
                 info.contentType = kControlContentIconRef ;
                 info.u.iconRef = iconRef ;
                 wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
                 info.contentType = kControlContentIconRef ;
                 info.u.iconRef = iconRef ;

-                SetControlData( (ControlRef) m_macControl, ii+1,kControlTabImageContentTag,
-                    sizeof( info ), (Ptr)&info );
+                m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );

                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 if ( UMAGetSystemVersion() < 0x1030 )
                 {                      
                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 if ( UMAGetSystemVersion() < 0x1030 )
                 {                      


@@ -412,7 +414,7 @@ void wxNotebook::MacSetupTabs()
 #endif
     }
     Rect bounds;
 #endif
     }
     Rect bounds;

-    UMAGetControlBoundsInWindowCoords((ControlRef)m_macControl, &bounds);
+    m_peer->GetRectInWindowCoords( &bounds ) ;

     InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
 }
 
     InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
 }
 


@@ -564,14 +566,14 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     }
     
     m_nSelection = nSel;
     }
     
     m_nSelection = nSel;

-    SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ;
+    m_peer->SetValue( m_nSelection + 1 ) ;

 }
 
 wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     OSStatus status = eventNotHandledErr ;
     
 }
 
 wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     OSStatus status = eventNotHandledErr ;
     

-    SInt32 newSel = GetControl32BitValue( (ControlRef) m_macControl ) - 1 ;
+    SInt32 newSel = m_peer->GetValue() - 1 ;

     if ( newSel != m_nSelection )
     {
         wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
     if ( newSel != m_nSelection )
     {
         wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,


@@ -589,7 +591,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
         }
         else
         {
         }
         else
         {

-            SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ;
+            m_peer->SetValue( m_nSelection + 1 ) ;

         }
         status = noErr ;
     }
         }
         status = noErr ;
     }