minor fixes; replace references to Windows95 with references to wxMSW where possible

[wxWidgets.git] / src / osx / carbon / app.cpp

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 6331ca653ac6f862d0620eb14d48b6fc6dbc2952..9f85b4dda2620a03dbd237e1ce49ab3ec45ecf92 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -956,7 +956,7 @@ void wxApp::CleanUp()
 // misc initialization stuff
 //----------------------------------------------------------------------
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+#if wxOSX_USE_CARBON && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 {
     OSStatus err = noErr ;
@@ -1151,7 +1151,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 #endif // wxUSE_LOG
 
     wxEventLoop * const
-        loop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive());
+        loop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
     if ( loop )
     {
         // process all pending events: