tweaked conditional compilation

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

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 69a6e85003c47e78e9195d7f54e42f3a3f433ccd..e59ca72ebeafcb49ebad5653f7408851acbf8c91 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -35,9 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
 #include "wx/thread.h"
 
 #ifdef __WXMAC__

-#ifndef __DARWIN__

 #include <Threads.h>
 #include <Threads.h>

-#endif

 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"
 #endif
 

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index dbdb59341f67579a89479f8499342cb48602a16e..c9342a3947819817e6d340e8800f32428478b0ee 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                

-#ifndef __DARWIN__

 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else


@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
                InitFloatingWindows() ;
        else
                InitWindows();

-#endif

 #endif
 
        if ( NavServicesAvailable() )
 #endif
 
        if ( NavServicesAvailable() )


@@ -588,8 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 

+#if !TARGET_CARBON

 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;

+#endif

 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,

diff --git a/src/mac/thread.cpp b/src/mac/thread.cpp
index 69a6e85003c47e78e9195d7f54e42f3a3f433ccd..e59ca72ebeafcb49ebad5653f7408851acbf8c91 100644 (file)
--- a/src/mac/thread.cpp
+++ b/src/mac/thread.cpp
@@ -35,9 +35,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXMAC__
 #include "wx/thread.h"
 
 #ifdef __WXMAC__

-#ifndef __DARWIN__

 #include <Threads.h>
 #include <Threads.h>

-#endif

 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"
 #endif
 

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index dbdb59341f67579a89479f8499342cb48602a16e..c9342a3947819817e6d340e8800f32428478b0ee 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                
                sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
        }
                

-#ifndef __DARWIN__

 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else
 #if TARGET_CARBON
 // Call currently implicitely done :           InitFloatingWindows() ;
 #else


@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                InitFloatingWindows() ;
        else
                InitWindows();
                InitFloatingWindows() ;
        else
                InitWindows();

-#endif

 #endif
 
        if ( NavServicesAvailable() )
 #endif
 
        if ( NavServicesAvailable() )


@@ -588,8 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 

+#if !TARGET_CARBON

 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
 static OSStatus helpMenuStatus = noErr ;
 static MenuItemIndex firstCustomItemIndex = 0 ;

+#endif

 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,