correcting Drag Data handling for 'TEXT' and 'utxt'

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index f6e54f85228c0b9828cb7e795ecd3a609f1d657b..25033f49c4b826caba02dbb456238e1d33f91168 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -129,7 +129,7 @@ bool wxNotebook::Create(wxWindow *parent,
             tabsize = kControlSizeSmall; 
     }
 
             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->GetControlRefAddr() ) );
     
     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
      tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
     


@@ -337,32 +337,35 @@ 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 )
         {

-            const wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
-            if ( bmap )
+            const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
+            if ( bmap.Ok() )

             {
                 ControlButtonContentInfo info ;
 
             {
                 ControlButtonContentInfo info ;
 

-                wxMacCreateBitmapButton( &info , *bmap ) ;
-                OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
+                wxMacCreateBitmapButton( &info , bmap ) ;
+#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 ) ;
             }
         }
                 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 ) ;
     }
     Rect bounds;
     m_peer->GetRectInWindowCoords( &bounds ) ;