removing unused flags

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 33c40fe4486fe485d9e4d1b1794fdf8cbe507394..d5f72a32d764aa7d52db76605c441ae1dcceaff8 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -130,7 +130,7 @@ bool wxNotebook::Create(wxWindow *parent,
     Rect bounds ;
     Str255 title ;
     
-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
     
     int tabstyle = kControlTabSmallNorthProc ;
     if ( HasFlag(wxNB_LEFT) )
@@ -360,17 +360,12 @@ void wxNotebook::MacSetupTabs()
         page = m_pages[ii];
         info.version = 0;
         info.iconSuiteID = 0;
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ;
-#else
-        strcpy( (char *) info.name , page->GetLabel() ) ;
-        c2pstr( (char *) info.name ) ;
-#endif
+        wxMacStringToPascal( page->GetLabel() , info.name ) ;
+
         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
@@ -489,7 +484,7 @@ bool wxNotebook::DoPhase(int /* nPhase */)
 
 void wxNotebook::Command(wxCommandEvent& event)
 {
-    wxFAIL_MSG("wxNotebook::Command not implemented");
+    wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));
 }
 
 // ----------------------------------------------------------------------------