removed carbon printing code

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 12bed007094ab5751ec89f7a11d4a5e693c88885..40fc28f1d664d08622b0ff5c6e2f02d41dab20f6 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -442,11 +442,12 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex ite
 
 // quickdraw
 
 
 // quickdraw
 

+#if !TARGET_CARBON
+

 int gPrOpenCounter = 0 ;
 
 int gPrOpenCounter = 0 ;
 

-OSStatus UMAPrOpen(void *macPrintSession)
+OSStatus UMAPrOpen()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )


@@ -456,25 +457,10 @@ OSStatus UMAPrOpen(void *macPrintSession)
         wxASSERT( err == noErr ) ;
     }
     return err ;
         wxASSERT( err == noErr ) ;
     }
     return err ;

-#else
-    OSStatus err = noErr ;
-    ++gPrOpenCounter ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMCreateSession((PMPrintSession *)macPrintSession) ;
-  #else
-        err = PMBegin() ;
-  #endif
-        wxASSERT( err == noErr ) ;
-    }
-    return err ;
-#endif

 }
 
 }
 

-OSStatus UMAPrClose(void *macPrintSession)
+OSStatus UMAPrClose()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )


@@ -485,25 +471,8 @@ OSStatus UMAPrClose(void *macPrintSession)
     }
     --gPrOpenCounter ;
     return err ;
     }
     --gPrOpenCounter ;
     return err ;

-#else
-    OSStatus err = noErr ;
-    wxASSERT( gPrOpenCounter >= 1 ) ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMRelease(*(PMPrintSession *)macPrintSession) ;
-        *(PMPrintSession *)macPrintSession = kPMNoReference;
-  #else
-        err = PMEnd() ;
-  #endif
-    }
-    --gPrOpenCounter ;
-    return err ;
-#endif

 }
 
 }
 

-#if !TARGET_CARBON
-

 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 12bed007094ab5751ec89f7a11d4a5e693c88885..40fc28f1d664d08622b0ff5c6e2f02d41dab20f6 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -442,11 +442,12 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex ite
 
 // quickdraw
 
 
 // quickdraw
 

+#if !TARGET_CARBON
+

 int gPrOpenCounter = 0 ;
 
 int gPrOpenCounter = 0 ;
 

-OSStatus UMAPrOpen(void *macPrintSession)
+OSStatus UMAPrOpen()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     ++gPrOpenCounter ;
     if ( gPrOpenCounter == 1 )


@@ -456,25 +457,10 @@ OSStatus UMAPrOpen(void *macPrintSession)
         wxASSERT( err == noErr ) ;
     }
     return err ;
         wxASSERT( err == noErr ) ;
     }
     return err ;

-#else
-    OSStatus err = noErr ;
-    ++gPrOpenCounter ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMCreateSession((PMPrintSession *)macPrintSession) ;
-  #else
-        err = PMBegin() ;
-  #endif
-        wxASSERT( err == noErr ) ;
-    }
-    return err ;
-#endif

 }
 
 }
 

-OSStatus UMAPrClose(void *macPrintSession)
+OSStatus UMAPrClose()

 {
 {

-#if !TARGET_CARBON

     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )
     OSErr err = noErr ;
     wxASSERT( gPrOpenCounter >= 1 ) ;
     if ( gPrOpenCounter == 1 )


@@ -485,25 +471,8 @@ OSStatus UMAPrClose(void *macPrintSession)
     }
     --gPrOpenCounter ;
     return err ;
     }
     --gPrOpenCounter ;
     return err ;

-#else
-    OSStatus err = noErr ;
-    wxASSERT( gPrOpenCounter >= 1 ) ;
-    if ( gPrOpenCounter == 1 )
-    {
-  #if PM_USE_SESSION_APIS
-        err = PMRelease(*(PMPrintSession *)macPrintSession) ;
-        *(PMPrintSession *)macPrintSession = kPMNoReference;
-  #else
-        err = PMEnd() ;
-  #endif
-    }
-    --gPrOpenCounter ;
-    return err ;
-#endif

 }
 
 }
 

-#if !TARGET_CARBON
-

 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {
 pascal QDGlobalsPtr GetQDGlobalsPtr (void) ;
 pascal QDGlobalsPtr GetQDGlobalsPtr (void)
 {