Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaked conditional compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-01-26 22:05:56 +00:00
parent e32d659d4d
commit 2f056c85d1
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/thread.cpp
View File

@@ -35,9 +35,7 @@
#include "wx/thread.h" #include "wx/thread.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#ifndef __DARWIN__
#include <Threads.h> #include <Threads.h>
#endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#endif #endif

4
src/mac/carbon/uma.cpp
View File

@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
} }
#ifndef __DARWIN__
#if TARGET_CARBON #if TARGET_CARBON
// Call currently implicitely done : InitFloatingWindows() ; // Call currently implicitely done : InitFloatingWindows() ;
#else #else
@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
InitFloatingWindows() ; InitFloatingWindows() ;
else else
InitWindows(); InitWindows();
#endif
#endif #endif
if ( NavServicesAvailable() ) 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 OSStatus helpMenuStatus = noErr ;
static MenuItemIndex firstCustomItemIndex = 0 ; static MenuItemIndex firstCustomItemIndex = 0 ;
#endif
OSStatus UMAGetHelpMenu( OSStatus UMAGetHelpMenu(
MenuRef * outHelpMenu, MenuRef * outHelpMenu,

2
src/mac/thread.cpp
View File

@@ -35,9 +35,7 @@
#include "wx/thread.h" #include "wx/thread.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#ifndef __DARWIN__
#include <Threads.h> #include <Threads.h>
#endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#endif #endif

4
src/mac/uma.cpp
View File

@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ; sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
} }
#ifndef __DARWIN__
#if TARGET_CARBON #if TARGET_CARBON
// Call currently implicitely done : InitFloatingWindows() ; // Call currently implicitely done : InitFloatingWindows() ;
#else #else
@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
InitFloatingWindows() ; InitFloatingWindows() ;
else else
InitWindows(); InitWindows();
#endif
#endif #endif
if ( NavServicesAvailable() ) 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 OSStatus helpMenuStatus = noErr ;
static MenuItemIndex firstCustomItemIndex = 0 ; static MenuItemIndex firstCustomItemIndex = 0 ;
#endif
OSStatus UMAGetHelpMenu( OSStatus UMAGetHelpMenu(
MenuRef * outHelpMenu, MenuRef * outHelpMenu,