Mac-ify wxTreeCtrl further.

[wxWidgets.git] / src / mac / uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 044ef97c966d66fbbe52d7e81b3b766160f8e00a..52e0497c558d7000867570bcd526b1fc038ac60f 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -289,10 +289,10 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
 
 int gPrOpenCounter = 0 ;
 
 
 int gPrOpenCounter = 0 ;
 

-#if !TARGET_CARBON
-OSStatus UMAPrOpen()
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus UMAPrOpen(PMPrintSession *macPrintSession)

 #else
 #else

-OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
+OSStatus UMAPrOpen()

 #endif
 {
 #if !TARGET_CARBON
 #endif
 {
 #if !TARGET_CARBON


@@ -311,7 +311,7 @@ OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS

-           err = PMCreateSession(macPrintPort) ;
+           err = PMCreateSession(macPrintSession) ;

   #else
            err = PMBegin() ;
   #endif
   #else
            err = PMBegin() ;
   #endif


@@ -321,10 +321,10 @@ OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
 #endif
 }
 
 #endif
 }
 

-#if !TARGET_CARBON
-OSStatus UMAPrClose()
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus UMAPrClose(PMPrintSession *macPrintSession)

 #else
 #else

-OSStatus UMAPrClose(PMPrintSession *macPrintPort)
+OSStatus UMAPrClose()

 #endif
 {
 #if !TARGET_CARBON
 #endif
 {
 #if !TARGET_CARBON


@@ -344,7 +344,8 @@ OSStatus UMAPrClose(PMPrintSession *macPrintPort)
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS
        if ( gPrOpenCounter == 1 )
        {
   #if PM_USE_SESSION_APIS

-           err = PMRelease(*macPrintPort) ;
+           err = PMRelease(*macPrintSession) ;
+           *macPrintSession = kPMNoReference;

   #else
            err = PMEnd() ;
   #endif
   #else
            err = PMEnd() ;
   #endif