From 2f056c85d182ae6c038394cfb9f6b56df3981877 Mon Sep 17 00:00:00 2001
From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 26 Jan 2002 22:05:56 +0000
Subject: [PATCH] tweaked conditional compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/thread.cpp | 2 --
 src/mac/carbon/uma.cpp    | 4 ++--
 src/mac/thread.cpp        | 2 --
 src/mac/uma.cpp           | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 69a6e85003..e59ca72ebe 100644
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -35,9 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
-#ifndef __DARWIN__
 #include <Threads.h>
-#endif
 #include "wx/mac/uma.h"
 #endif
 
diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index dbdb59341f..c9342a3947 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
 	}
 		
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :		InitFloatingWindows() ;
 #else
@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		InitFloatingWindows() ;
 	else
 		InitWindows();
-#endif
 #endif
 
 	if ( NavServicesAvailable() )
@@ -588,8 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp
index 69a6e85003..e59ca72ebe 100644
--- a/src/mac/thread.cpp
+++ b/src/mac/thread.cpp
@@ -35,9 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
-#ifndef __DARWIN__
 #include <Threads.h>
-#endif
 #include "wx/mac/uma.h"
 #endif
 
diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index dbdb59341f..c9342a3947 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
 	}
 		
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :		InitFloatingWindows() ;
 #else
@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		InitFloatingWindows() ;
 	else
 		InitWindows();
-#endif
 #endif
 
 	if ( NavServicesAvailable() )
@@ -588,8 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
-- 
2.45.2