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

corrected conditional compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-28 06:30:58 +00:00
parent 39348a9631
commit 93f0fe75dd
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/mac/uma.h
View File

@@ -82,9 +82,9 @@ void UMADrawMenuBar() ;
void UMAShowWatchCursor() ; void UMAShowWatchCursor() ;
void UMAShowArrowCursor() ; void UMAShowArrowCursor() ;
#if PM_USE_SESSION_APIS #if TARGET_CARBON && PM_USE_SESSION_APIS
OSStatus UMAPrOpen(PMPrintSession *macPrintPort) ; OSStatus UMAPrOpen(PMPrintSession *macPrintSession) ;
OSStatus UMAPrClose(PMPrintSession *macPrintPort) ; OSStatus UMAPrClose(PMPrintSession *macPrintSession) ;
#else #else
OSStatus UMAPrOpen() ; OSStatus UMAPrOpen() ;
OSStatus UMAPrClose() ; OSStatus UMAPrClose() ;

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

@@ -289,8 +289,8 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
int gPrOpenCounter = 0 ; int gPrOpenCounter = 0 ;
#if PM_USE_SESSION_APIS #if TARGET_CARBON && PM_USE_SESSION_APIS
OSStatus UMAPrOpen(PMPrintSession *macPrintPort) OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
#else #else
OSStatus UMAPrOpen() OSStatus UMAPrOpen()
#endif #endif
@@ -311,7 +311,7 @@ OSStatus UMAPrOpen()
if ( gPrOpenCounter == 1 ) if ( gPrOpenCounter == 1 )
{ {
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
err = PMCreateSession(macPrintPort) ; err = PMCreateSession(macPrintSession) ;
#else #else
err = PMBegin() ; err = PMBegin() ;
#endif #endif
@@ -321,8 +321,8 @@ OSStatus UMAPrOpen()
#endif #endif
} }
#if PM_USE_SESSION_APIS #if TARGET_CARBON && PM_USE_SESSION_APIS
OSStatus UMAPrClose(PMPrintSession *macPrintPort) OSStatus UMAPrClose(PMPrintSession *macPrintSession)
#else #else
OSStatus UMAPrClose() OSStatus UMAPrClose()
#endif #endif
@@ -344,7 +344,8 @@ OSStatus UMAPrClose()
if ( gPrOpenCounter == 1 ) if ( gPrOpenCounter == 1 )
{ {
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
err = PMRelease(*macPrintPort) ; err = PMRelease(*macPrintSession) ;
*macPrintSession = kPMNoReference;
#else #else
err = PMEnd() ; err = PMEnd() ;
#endif #endif

13
src/mac/uma.cpp
View File

@@ -289,8 +289,8 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
int gPrOpenCounter = 0 ; int gPrOpenCounter = 0 ;
#if PM_USE_SESSION_APIS #if TARGET_CARBON && PM_USE_SESSION_APIS
OSStatus UMAPrOpen(PMPrintSession *macPrintPort) OSStatus UMAPrOpen(PMPrintSession *macPrintSession)
#else #else
OSStatus UMAPrOpen() OSStatus UMAPrOpen()
#endif #endif
@@ -311,7 +311,7 @@ OSStatus UMAPrOpen()
if ( gPrOpenCounter == 1 ) if ( gPrOpenCounter == 1 )
{ {
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
err = PMCreateSession(macPrintPort) ; err = PMCreateSession(macPrintSession) ;
#else #else
err = PMBegin() ; err = PMBegin() ;
#endif #endif
@@ -321,8 +321,8 @@ OSStatus UMAPrOpen()
#endif #endif
} }
#if PM_USE_SESSION_APIS #if TARGET_CARBON && PM_USE_SESSION_APIS
OSStatus UMAPrClose(PMPrintSession *macPrintPort) OSStatus UMAPrClose(PMPrintSession *macPrintSession)
#else #else
OSStatus UMAPrClose() OSStatus UMAPrClose()
#endif #endif
@@ -344,7 +344,8 @@ OSStatus UMAPrClose()
if ( gPrOpenCounter == 1 ) if ( gPrOpenCounter == 1 )
{ {
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
err = PMRelease(*macPrintPort) ; err = PMRelease(*macPrintSession) ;
*macPrintSession = kPMNoReference;
#else #else
err = PMEnd() ; err = PMEnd() ;
#endif #endif