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

corrected use of Print Manager Session APIs for Carbon targets

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-23 20:38:12 +00:00
parent 4cb1706ae5
commit 87df17a11b
4 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mac/carbon/dcprint.cpp
View File

@@ -42,19 +42,19 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_printData = printdata ; m_printData = printdata ;
m_printData.ConvertToNative() ; m_printData.ConvertToNative() ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
err = UMAPrOpen() ;
#else
err = UMAPrOpen(&m_macPrintPort) ; err = UMAPrOpen(&m_macPrintPort) ;
#else
err = UMAPrOpen() ;
#endif #endif
if ( err ) if ( err )
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ;
#else
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif #endif
} }
@@ -99,7 +99,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if PM_USE_SESSION_APIS
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif
} }
// sets current port // sets current port
::GetPort( &m_macPort ) ; ::GetPort( &m_macPort ) ;
@@ -153,16 +157,16 @@ wxPrinterDC::~wxPrinterDC(void)
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ;
#else
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif #endif
} }
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ; UMAPrClose(&m_macPrintPort) ;
#else #else
UMAPrClose(&m_macPrintPort) ; UMAPrClose() ;
#endif #endif
} }
#endif #endif
@@ -235,11 +239,12 @@ void wxPrinterDC::StartPage(void)
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
PMSessionEndPage(m_macPrintPort); PMSessionEndPage(m_macPrintPort);
PMSessionEndDocument(m_macPrintPort); PMSessionEndDocument(m_macPrintPort);
UMAPrClose(&m_macPrintPort) ;
#else #else
PMEndPage(m_macPrintPort); PMEndPage(m_macPrintPort);
PMEndDocument(m_macPrintPort); PMEndDocument(m_macPrintPort);
UMAPrClose() ;
#endif #endif
UMAPrClose(&m_macPrintPort) ;
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }
@@ -278,10 +283,11 @@ void wxPrinterDC::EndPage(void)
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
PMSessionEndDocument(m_macPrintPort); PMSessionEndDocument(m_macPrintPort);
UMAPrClose(&m_macPrintPort) ;
#else #else
PMEndDocument(m_macPrintPort); PMEndDocument(m_macPrintPort);
UMAPrClose() ;
#endif #endif
UMAPrClose(&m_macPrintPort) ;
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }

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

@@ -289,10 +289,10 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
int gPrOpenCounter = 0 ; int gPrOpenCounter = 0 ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
OSStatus UMAPrOpen()
#else
OSStatus UMAPrOpen(PMPrintSession *macPrintPort) OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
#else
OSStatus UMAPrOpen()
#endif #endif
{ {
#if !TARGET_CARBON #if !TARGET_CARBON
@@ -321,10 +321,10 @@ OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
#endif #endif
} }
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
OSStatus UMAPrClose()
#else
OSStatus UMAPrClose(PMPrintSession *macPrintPort) OSStatus UMAPrClose(PMPrintSession *macPrintPort)
#else
OSStatus UMAPrClose()
#endif #endif
{ {
#if !TARGET_CARBON #if !TARGET_CARBON

34
src/mac/dcprint.cpp
View File

@@ -42,19 +42,19 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_printData = printdata ; m_printData = printdata ;
m_printData.ConvertToNative() ; m_printData.ConvertToNative() ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
err = UMAPrOpen() ;
#else
err = UMAPrOpen(&m_macPrintPort) ; err = UMAPrOpen(&m_macPrintPort) ;
#else
err = UMAPrOpen() ;
#endif #endif
if ( err ) if ( err )
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ;
#else
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif #endif
} }
@@ -99,7 +99,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if PM_USE_SESSION_APIS
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif
} }
// sets current port // sets current port
::GetPort( &m_macPort ) ; ::GetPort( &m_macPort ) ;
@@ -153,16 +157,16 @@ wxPrinterDC::~wxPrinterDC(void)
{ {
message.Printf( "Print Error %d", err ) ; message.Printf( "Print Error %d", err ) ;
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ;
#else
UMAPrClose(&m_macPrintPort) ; UMAPrClose(&m_macPrintPort) ;
#else
UMAPrClose() ;
#endif #endif
} }
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
UMAPrClose() ; UMAPrClose(&m_macPrintPort) ;
#else #else
UMAPrClose(&m_macPrintPort) ; UMAPrClose() ;
#endif #endif
} }
#endif #endif
@@ -235,11 +239,12 @@ void wxPrinterDC::StartPage(void)
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
PMSessionEndPage(m_macPrintPort); PMSessionEndPage(m_macPrintPort);
PMSessionEndDocument(m_macPrintPort); PMSessionEndDocument(m_macPrintPort);
UMAPrClose(&m_macPrintPort) ;
#else #else
PMEndPage(m_macPrintPort); PMEndPage(m_macPrintPort);
PMEndDocument(m_macPrintPort); PMEndDocument(m_macPrintPort);
UMAPrClose() ;
#endif #endif
UMAPrClose(&m_macPrintPort) ;
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }
@@ -278,10 +283,11 @@ void wxPrinterDC::EndPage(void)
wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ; wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
#if PM_USE_SESSION_APIS #if PM_USE_SESSION_APIS
PMSessionEndDocument(m_macPrintPort); PMSessionEndDocument(m_macPrintPort);
UMAPrClose(&m_macPrintPort) ;
#else #else
PMEndDocument(m_macPrintPort); PMEndDocument(m_macPrintPort);
UMAPrClose() ;
#endif #endif
UMAPrClose(&m_macPrintPort) ;
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }

12
src/mac/uma.cpp
View File

@@ -289,10 +289,10 @@ void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId )
int gPrOpenCounter = 0 ; int gPrOpenCounter = 0 ;
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
OSStatus UMAPrOpen()
#else
OSStatus UMAPrOpen(PMPrintSession *macPrintPort) OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
#else
OSStatus UMAPrOpen()
#endif #endif
{ {
#if !TARGET_CARBON #if !TARGET_CARBON
@@ -321,10 +321,10 @@ OSStatus UMAPrOpen(PMPrintSession *macPrintPort)
#endif #endif
} }
#if !TARGET_CARBON #if PM_USE_SESSION_APIS
OSStatus UMAPrClose()
#else
OSStatus UMAPrClose(PMPrintSession *macPrintPort) OSStatus UMAPrClose(PMPrintSession *macPrintPort)
#else
OSStatus UMAPrClose()
#endif #endif
{ {
#if !TARGET_CARBON #if !TARGET_CARBON