Implemented wxBitmapDataObject.

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

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 56cacb02a2392596999174936c07daf09238d85b..d5f72a32d764aa7d52db76605c441ae1dcceaff8 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -130,7 +130,7 @@ bool wxNotebook::Create(wxWindow *parent,
     Rect bounds ;
     Str255 title ;
     
     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) )
     
     int tabstyle = kControlTabSmallNorthProc ;
     if ( HasFlag(wxNB_LEFT) )


@@ -360,12 +360,8 @@ void wxNotebook::MacSetupTabs()
         page = m_pages[ii];
         info.version = 0;
         info.iconSuiteID = 0;
         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 ) ;
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
             sizeof( ControlTabInfoRec) , (char*) &info ) ;
         SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;


@@ -488,7 +484,7 @@ bool wxNotebook::DoPhase(int /* nPhase */)
 
 void wxNotebook::Command(wxCommandEvent& event)
 {
 
 void wxNotebook::Command(wxCommandEvent& event)
 {

-    wxFAIL_MSG("wxNotebook::Command not implemented");
+    wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------