corrected path format for wxMac compiled with Apple DevTools

[wxWidgets.git] / src / mac / carbon / dcprint.cpp

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 1467c4970fb88afaf96f74bfc16e45c8e3e219de..274c90957a041c52db50286e3a8f9328feec4386 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -41,13 +41,25 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        
        m_printData = printdata ;
        m_printData.ConvertToNative() ;
        
        m_printData = printdata ;
        m_printData.ConvertToNative() ;

-       
+
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+       err = UMAPrOpen(&m_macPrintSession) ;
+       if ( err != noErr || m_macPrintSession == kPMNoData )
+#else

        err = UMAPrOpen() ;
        err = UMAPrOpen() ;

-       if ( err )
+       if ( err != noErr )
+#endif

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintSession) ;
+#else

                UMAPrClose() ;
                UMAPrClose() ;

+#endif
+               m_ok = FALSE;
+               return;

        }
        
 #if !TARGET_CARBON
        }
        
 #if !TARGET_CARBON


@@ -57,11 +69,14 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
                // the driver has changed in the mean time, should we pop up a page setup dialog ?
        }
        err = PrError() ;
                // the driver has changed in the mean time, should we pop up a page setup dialog ?
        }
        err = PrError() ;

-       if ( err )
+       if ( err != noErr )

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();

                UMAPrClose() ;
                UMAPrClose() ;

+               m_ok = FALSE;
+               return;

        }
        ::GetPort( &macPrintFormerPort ) ;
        m_macPrintPort = ::PrOpenDoc( m_printData.m_macPrintInfo , NULL , NULL ) ;
        }
        ::GetPort( &macPrintFormerPort ) ;
        m_macPrintPort = ::PrOpenDoc( m_printData.m_macPrintInfo , NULL , NULL ) ;


@@ -70,21 +85,38 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();

                UMAPrClose() ;
                UMAPrClose() ;

+               m_ok = FALSE;
+               return;

        }
        // sets current port
        m_macPort = (GrafPtr ) m_macPrintPort ;
 #else
        }
        // sets current port
        m_macPort = (GrafPtr ) m_macPrintPort ;
 #else

+  #if PM_USE_SESSION_APIS
+    err = PMSessionBeginDocument(m_macPrintSession,
+              m_printData.m_macPrintSettings, 
+             m_printData.m_macPageFormat);
+    if ( err != noErr )
+  #else

        m_macPrintPort = kPMNoReference ;
     err = PMBeginDocument(
        m_macPrintPort = kPMNoReference ;
     err = PMBeginDocument(

-       m_printData.m_macPrintSettings, 
-       m_printData.m_macPageFormat, 
-       &m_macPrintPort);
+             m_printData.m_macPrintSettings, 
+             m_printData.m_macPageFormat, 
+             &m_macPrintPort);

     if ( err != noErr || m_macPrintPort == kPMNoReference )
     if ( err != noErr || m_macPrintPort == kPMNoReference )

+  #endif

     {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
     {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();
+  #if TARGET_CARBON && PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintSession) ;
+  #else

                UMAPrClose() ;
                UMAPrClose() ;

+  #endif
+               m_ok = FALSE;
+               return;

     }
        // sets current port
        ::GetPort( &m_macPort ) ;
     }
        // sets current port
        ::GetPort( &m_macPort ) ;


@@ -92,6 +124,24 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        m_ok = TRUE ;
        m_minY = m_minX = 0 ;
 #if TARGET_CARBON
        m_ok = TRUE ;
        m_minY = m_minX = 0 ;
 #if TARGET_CARBON

+       PMRect rPaper;
+       
+       err = PMGetAdjustedPaperRect(m_printData.m_macPageFormat, &rPaper);
+    if ( err != noErr )
+    {
+               message.Printf( "Print Error %d", err ) ;
+               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+               dialog.ShowModal();
+  #if TARGET_CARBON && PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintSession) ;
+  #else
+               UMAPrClose() ;
+  #endif
+               m_ok = FALSE;
+               return;
+    }
+       m_maxX = rPaper.right - rPaper.left ;
+       m_maxY = rPaper.bottom - rPaper.top ;

 #else
        m_maxX = (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).rPaper.left ;
        m_maxY = (**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).rPaper.top ;
 #else
        m_maxX = (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).rPaper.left ;
        m_maxY = (**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).rPaper.top ;


@@ -108,7 +158,7 @@ wxPrinterDC::~wxPrinterDC(void)
                ::PrCloseDoc( m_macPrintPort  ) ;
                err = PrError() ;
                
                ::PrCloseDoc( m_macPrintPort  ) ;
                err = PrError() ;
                

-               if ( !err )
+               if ( err == noErr )

                {
                        if ( (**m_printData.m_macPrintInfo).prJob.bJDocLoop == bSpoolLoop )
                        {
                {
                        if ( (**m_printData.m_macPrintInfo).prJob.bJDocLoop == bSpoolLoop )
                        {


@@ -120,7 +170,7 @@ wxPrinterDC::~wxPrinterDC(void)
                {
                        message.Printf( "Print Error %d", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                {
                        message.Printf( "Print Error %d", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

-                       UMAPrClose() ;
+                   dialog.ShowModal();

                }
                ::UMAPrClose() ;
 //       ::SetPort( macPrintFormerPort ) ;
                }
                ::UMAPrClose() ;
 //       ::SetPort( macPrintFormerPort ) ;


@@ -129,14 +179,22 @@ wxPrinterDC::~wxPrinterDC(void)
 #else
        if ( m_ok ) 
        {
 #else
        if ( m_ok ) 
        {

-       err = PMEndDocument(m_macPrintPort);
-       if ( !err )
+  #if PM_USE_SESSION_APIS
+           err = PMSessionEndDocument(m_macPrintSession);
+  #else
+           err = PMEndDocument(m_macPrintPort);
+  #endif
+       if ( err != noErr )

        {
                        message.Printf( "Print Error %d", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                        message.Printf( "Print Error %d", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

-                       UMAPrClose() ;
+                   dialog.ShowModal();

        }
        }

-       UMAPrClose() ;
+  #if TARGET_CARBON && PM_USE_SESSION_APIS
+           UMAPrClose(&m_macPrintSession) ;
+  #else
+           UMAPrClose() ;
+  #endif

        }
 #endif
 }
        }
 #endif
 }


@@ -183,25 +241,39 @@ void wxPrinterDC::StartPage(void)
        Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
        ::ClipRect( &clip ) ;
        err = PrError() ;
        Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
        ::ClipRect( &clip ) ;
        err = PrError() ;

-       if ( err )
+       if ( err != noErr )

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

-               ::PrClosePage(  m_macPrintPort) ;
-               ::PrCloseDoc( m_macPrintPort  ) ;
+               dialog.ShowModal();
+               ::PrClosePage( m_macPrintPort ) ;
+               ::PrCloseDoc( m_macPrintPort ) ;

                ::UMAPrClose() ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
 #else
                ::UMAPrClose() ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
 #else

-    err = PMBeginPage(m_macPrintPort, nil);
-       if ( err )
+  #if PM_USE_SESSION_APIS
+       err = PMSessionBeginPage(m_macPrintSession,
+                                m_printData.m_macPageFormat,
+                                nil);
+  #else
+       err = PMBeginPage(m_macPrintPort, nil);
+  #endif
+       if ( err != noErr )

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();
+  #if PM_USE_SESSION_APIS
+               PMSessionEndPage(m_macPrintSession);
+               PMSessionEndDocument(m_macPrintSession);
+               UMAPrClose(&m_macPrintSession) ;
+  #else

                PMEndPage(m_macPrintPort);
                PMEndDocument(m_macPrintPort);
                UMAPrClose() ;
                PMEndPage(m_macPrintPort);
                PMEndDocument(m_macPrintPort);
                UMAPrClose() ;

+  #endif

                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }


@@ -219,23 +291,34 @@ void wxPrinterDC::EndPage(void)
 #if !TARGET_CARBON
        PrClosePage(  (TPrPort*) m_macPort ) ;
        err = PrError() ;
 #if !TARGET_CARBON
        PrClosePage(  (TPrPort*) m_macPort ) ;
        err = PrError() ;

-       if ( err )
+       if ( err != noErr )

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();

                ::PrCloseDoc( m_macPrintPort  ) ;
                ::UMAPrClose() ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
 #else
                ::PrCloseDoc( m_macPrintPort  ) ;
                ::UMAPrClose() ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
 #else

+  #if PM_USE_SESSION_APIS
+       err = PMSessionEndPage(m_macPrintSession);
+  #else

        err = PMEndPage(m_macPrintPort);
        err = PMEndPage(m_macPrintPort);

-       if ( err )
+  #endif
+       if ( err != noErr )

        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        {
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;

+               dialog.ShowModal();
+  #if PM_USE_SESSION_APIS
+               PMSessionEndDocument(m_macPrintSession);
+               UMAPrClose(&m_macPrintSession) ;
+  #else

                PMEndDocument(m_macPrintPort);
                UMAPrClose() ;
                PMEndDocument(m_macPrintPort);
                UMAPrClose() ;

+  #endif

                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }