X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53fd991c445a07562b8d7e9ecaf9fc599c19dd4f..fbf456aa8952c6d2d3edeea1208b0e3159a3cb8d:/src/mac/carbon/app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 0c87a10378..d662578090 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() ;
@@ -795,7 +796,9 @@ wxApp::wxApp()
   m_topWindow = NULL;
   wxTheApp = this;
 
-  m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+  m_wantDebugOutput = TRUE;
+#endif
 
   argc = 0;
   argv = NULL;