diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 0c87a10378..8cd0fbe281 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -373,11 +373,12 @@ void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding CopyCStringToPascal( from , to ) ; } } - +#ifdef WXMAKINGDLL #ifndef __DARWIN__ // we know it's there ;-) WXIMPORT char std::__throws_bad_alloc ; #endif +#endif bool wxApp::Initialize() { @@ -509,6 +510,9 @@ bool wxApp::Initialize() #endif // wxUSE_LOG #endif + wxWinMacWindowList = new wxList(wxKEY_INTEGER); + wxWinMacControlList = new wxList(wxKEY_INTEGER); + wxInitializeStockLists(); wxInitializeStockObjects(); @@ -523,9 +527,6 @@ bool wxApp::Initialize() return FALSE; } - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); - wxMacCreateNotifierTable() ; UMAShowArrowCursor() ; diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 0c87a10378..8cd0fbe281 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -373,11 +373,12 @@ void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding CopyCStringToPascal( from , to ) ; } } - +#ifdef WXMAKINGDLL #ifndef __DARWIN__ // we know it's there ;-) WXIMPORT char std::__throws_bad_alloc ; #endif +#endif bool wxApp::Initialize() { @@ -509,6 +510,9 @@ bool wxApp::Initialize() #endif // wxUSE_LOG #endif + wxWinMacWindowList = new wxList(wxKEY_INTEGER); + wxWinMacControlList = new wxList(wxKEY_INTEGER); + wxInitializeStockLists(); wxInitializeStockObjects(); @@ -523,9 +527,6 @@ bool wxApp::Initialize() return FALSE; } - wxWinMacWindowList = new wxList(wxKEY_INTEGER); - wxWinMacControlList = new wxList(wxKEY_INTEGER); - wxMacCreateNotifierTable() ; UMAShowArrowCursor() ;