diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h index cd3722edee..f699f65351 100644 --- 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 - PMPrintContext m_macPrintPort ; + #if PM_USE_SESSION_APIS + PMPrintSession m_macPrintPort ; + #else + PMPrintContext m_macPrintPort ; + #endif #else - TPPrPort m_macPrintPort ; + TPPrPort m_macPrintPort ; #endif - wxPrintData m_printData ; + wxPrintData m_printData ; #endif // wxUSE_PRINTING_ARCHITECTURE }; diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h index fd2017069e..01885e7519 100644 --- a/include/wx/mac/uma.h +++ b/include/wx/mac/uma.h @@ -82,8 +82,13 @@ void UMADrawMenuBar() ; void UMAShowWatchCursor() ; void UMAShowArrowCursor() ; +#if PM_USE_SESSION_APIS +OSStatus UMAPrOpen(PMPrintSession *macPrintPort) ; +OSStatus UMAPrClose(PMPrintSession *macPrintPort) ; +#else OSStatus UMAPrOpen() ; OSStatus UMAPrClose() ; +#endif // window manager