bracketed include def for CW nothrow flag for MAKINGDLL only

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 0c87a1037886bd44a8f1a58638ee29ea278a7dd9..8cd0fbe281b0ece16e7df2364842401eb6ba13ed 100644 (file)
--- 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 ) ;
     }
 }
       CopyCStringToPascal( from , to ) ;
     }
 }

-
+#ifdef WXMAKINGDLL

 #ifndef __DARWIN__
 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 #ifndef __DARWIN__
 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif

+#endif

 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {


@@ -509,6 +510,9 @@ bool wxApp::Initialize()
 #endif // wxUSE_LOG
 #endif
 
 #endif // wxUSE_LOG
 #endif
 

+  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
+  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+

   wxInitializeStockLists();
   wxInitializeStockObjects();
 
   wxInitializeStockLists();
   wxInitializeStockObjects();
 


@@ -523,9 +527,6 @@ bool wxApp::Initialize()
      return FALSE;
   }
 
      return FALSE;
   }
 

-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
-

   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;
   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 0c87a1037886bd44a8f1a58638ee29ea278a7dd9..8cd0fbe281b0ece16e7df2364842401eb6ba13ed 100644 (file)
--- 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 ) ;
     }
 }
       CopyCStringToPascal( from , to ) ;
     }
 }

-
+#ifdef WXMAKINGDLL

 #ifndef __DARWIN__
 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 #ifndef __DARWIN__
 // we know it's there ;-)
 WXIMPORT char std::__throws_bad_alloc ;
 #endif

+#endif

 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {


@@ -509,6 +510,9 @@ bool wxApp::Initialize()
 #endif // wxUSE_LOG
 #endif
 
 #endif // wxUSE_LOG
 #endif
 

+  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
+  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+

   wxInitializeStockLists();
   wxInitializeStockObjects();
 
   wxInitializeStockLists();
   wxInitializeStockObjects();
 


@@ -523,9 +527,6 @@ bool wxApp::Initialize()
      return FALSE;
   }
 
      return FALSE;
   }
 

-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
-

   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;
   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;