Don't use images for wxNotebook because of crash

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 33c40fe4486fe485d9e4d1b1794fdf8cbe507394..56cacb02a2392596999174936c07daf09238d85b 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -369,8 +369,7 @@ void wxNotebook::MacSetupTabs()
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;

-        
-#if TARGET_CARBON
+#if 0 // TARGET_CARBON

         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 33c40fe4486fe485d9e4d1b1794fdf8cbe507394..56cacb02a2392596999174936c07daf09238d85b 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -369,8 +369,7 @@ void wxNotebook::MacSetupTabs()
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;

-        
-#if TARGET_CARBON
+#if 0 // TARGET_CARBON

         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
             // tab controls only support very specific types of images, therefore we are doing an odyssee