X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..c97e7fa8dbda704c9c9cdb61c22ebdf9b692e114:/src/mac/notebmac.cpp?ds=sidebyside diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index ab97b53540..ca975252fe 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -42,6 +42,9 @@ const short kwxMacTabBottomMargin = 16 ; // ---------------------------------------------------------------------------- #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) @@ -257,8 +260,12 @@ bool wxNotebook::InsertPage(int nPage, 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 );