use Print Manager session APIs if PM_USE_SESSION_APIS is true

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

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index cd3722edee78045a53ec2734f4f176f3d7fff382..f699f65351c0a05b0d84837adeb66c1b7ae9674a 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -35,11 +35,15 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void EndPage(void) ;
  protected :
  #if TARGET_CARBON
     virtual void EndPage(void) ;
  protected :
  #if TARGET_CARBON

-       PMPrintContext  m_macPrintPort ;
+    #if PM_USE_SESSION_APIS
+      PMPrintSession  m_macPrintPort ;
+    #else
+      PMPrintContext  m_macPrintPort ;
+    #endif

  #else
  #else

-       TPPrPort        m_macPrintPort ;
+      TPPrPort         m_macPrintPort ;

  #endif
  #endif

-       wxPrintData m_printData ;
+      wxPrintData m_printData ;

 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index fd2017069ecd2a410fcc2514b5312f6dc7be279a..01885e751968e5cc68fbc39740d83db8f269cb0a 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -82,8 +82,13 @@ void                 UMADrawMenuBar() ;
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 

+#if PM_USE_SESSION_APIS
+OSStatus               UMAPrOpen(PMPrintSession *macPrintPort) ;
+OSStatus               UMAPrClose(PMPrintSession *macPrintPort) ;
+#else

 OSStatus               UMAPrOpen() ;
 OSStatus               UMAPrClose() ;
 OSStatus               UMAPrOpen() ;
 OSStatus               UMAPrClose() ;

+#endif

 
 // window manager
 
 
 // window manager