added xpmdecod.cpp

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

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index ab97b53540b24c151b69b20fc22d884988edb2c2..ca975252fe12ef15fd79b5b940ed4aba5542f0e2 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -42,6 +42,9 @@ const short kwxMacTabBottomMargin = 16 ;
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARIES
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARIES

+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+

 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 


@@ -257,8 +260,12 @@ bool wxNotebook::InsertPage(int nPage,
                
                tie.version = 0 ;
                tie.iconSuiteID = 0 ;
                
                tie.version = 0 ;
                tie.iconSuiteID = 0 ;

-               strcpy( (char*) tie.name , strText ) ;
-               c2pstr( (char*) tie.name ) ;    
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) tie.name , strText ) ;
+#else
+               strcpy( (char *) tie.name , strText ) ;
+               c2pstr( (char *) tie.name ) ;
+#endif

                SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ;
                SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );
 
                SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ;
                SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );