applied correction from Marc Newsam in calculations of linesize

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

diff --git a/src/mac/carbon/notebook.cpp b/src/mac/carbon/notebook.cpp
index a4f93917eb93c6a26ecb3eae157a7d41bcbc9093..862bbb205c8b2f06c7573d8d6b8341dc7a034ebd 100644 (file)
--- a/src/mac/carbon/notebook.cpp
+++ b/src/mac/carbon/notebook.cpp
@@ -41,7 +41,9 @@ const short kwxMacTabBottomMargin = 16 ;
 // event table
 // ----------------------------------------------------------------------------
 
-#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)
 
@@ -52,7 +54,6 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
-#endif
 
 // ============================================================================
 // implementation
@@ -256,8 +257,7 @@ bool wxNotebook::InsertPage(int nPage,
                
                tie.version = 0 ;
                tie.iconSuiteID = 0 ;
-               strcpy( (char*) tie.name , strText ) ;
-               c2pstr( (char*) tie.name ) ;    
+               c2pstrcpy( (StringPtr) tie.name , strText ) ;
                SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ;
                SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );