corrected path splitting for mac relative paths

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 2238c6ecfd75dbdbc118189bb98e5262ac84fe4c..7f093c6e718748d43520556e1dab0fe2385f5c7a 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -27,6 +27,16 @@
 #include "wx/msgdlg.h"
 #include <math.h>
 #include "wx/mac/uma.h"
 #include "wx/msgdlg.h"
 #include <math.h>
 #include "wx/mac/uma.h"

+#ifndef __DARWIN__
+#include "Printing.h"
+#endif
+
+#if defined(TARGET_CARBON) && !defined(__DARWIN__)
+#  if PM_USE_SESSION_APIS
+#    include <PMCore.h>
+#  endif
+#  include <PMApplication.h>
+#endif

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)


@@ -42,74 +52,109 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        m_printData = printdata ;
        m_printData.ConvertToNative() ;
 
        m_printData = printdata ;
        m_printData.ConvertToNative() ;
 

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

 #else
 #else

-       err = UMAPrOpen(&m_macPrintPort) ;
+       err = UMAPrOpen(NULL) ;
+       if ( err != noErr )

 #endif
 #endif

-       if ( err )

        {
                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) ;

-#if !TARGET_CARBON
-               UMAPrClose() ;
+               dialog.ShowModal();
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintSessionPort) ;

 #else
 #else

-               UMAPrClose(&m_macPrintPort) ;
+               UMAPrClose(NULL) ;

 #endif
 #endif

+               m_ok = FALSE;
+               return;

        }
        
 #if !TARGET_CARBON
        }
        
 #if !TARGET_CARBON

-       if ( ::PrValidate( m_printData.m_macPrintInfo ) )
+       if ( ::PrValidate( (THPrint) m_printData.m_macPrintSettings ) )

        {
        {

-               ::PrStlDialog( m_printData.m_macPrintInfo ) ;
+               ::PrStlDialog( (THPrint) m_printData.m_macPrintSettings ) ;

                // 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) ;

-               UMAPrClose() ;
+               dialog.ShowModal();
+               UMAPrClose(NULL) ;
+               m_ok = FALSE;
+               return;

        }
        ::GetPort( &macPrintFormerPort ) ;
        }
        ::GetPort( &macPrintFormerPort ) ;

-       m_macPrintPort = ::PrOpenDoc( m_printData.m_macPrintInfo , NULL , NULL ) ;
+       m_macPrintSessionPort = ::PrOpenDoc( (THPrint) m_printData.m_macPrintSettings , NULL , NULL ) ;

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

-               UMAPrClose() ;
+               dialog.ShowModal();
+               UMAPrClose(NULL) ;
+               m_ok = FALSE;
+               return;

        }
        // sets current port
        }
        // sets current port

-       m_macPort = (GrafPtr ) m_macPrintPort ;
+       m_macPort = (GrafPtr ) m_macPrintSessionPort ;

 #else
 #else

-       m_macPrintPort = kPMNoReference ;

   #if PM_USE_SESSION_APIS
   #if PM_USE_SESSION_APIS

-    err = PMSessionBeginDocument(
-       m_macPrintPort,
-       m_printData.m_macPrintSettings, 
-       m_printData.m_macPageFormat);
+    err = PMSessionBeginDocument((PMPrintSession)m_macPrintSessionPort,
+              (PMPrintSettings)m_printData.m_macPrintSettings, 
+             (PMPageFormat)m_printData.m_macPageFormat);
+    if ( err != noErr )

   #else
   #else

+       m_macPrintSessionPort = kPMNoReference ;

     err = PMBeginDocument(
     err = PMBeginDocument(

-       m_printData.m_macPrintSettings, 
-       m_printData.m_macPageFormat, 
-       &m_macPrintPort);
+             m_printData.m_macPrintSettings, 
+             m_printData.m_macPageFormat, 
+             &m_macPrintSessionPort);
+    if ( err != noErr || m_macPrintSessionPort == kPMNoReference )

   #endif
   #endif

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

     {
                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(&m_macPrintPort) ;
+               dialog.ShowModal();
+  #if TARGET_CARBON && PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintSessionPort) ;
+  #else
+               UMAPrClose(NULL) ;
+  #endif
+               m_ok = FALSE;
+               return;

     }
        // sets current port
     }
        // sets current port

-       ::GetPort( &m_macPort ) ;
+       ::GetPort( (GrafPtr *)&m_macPort ) ;

 #endif
        m_ok = TRUE ;
        m_minY = m_minX = 0 ;
 #if TARGET_CARBON
 #endif
        m_ok = TRUE ;
        m_minY = m_minX = 0 ;
 #if TARGET_CARBON

+       PMRect rPaper;
+       
+       err = PMGetAdjustedPaperRect((PMPageFormat)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_macPrintSessionPort) ;
+  #else
+               UMAPrClose(NULL) ;
+  #endif
+               m_ok = FALSE;
+               return;
+    }
+       m_maxX = rPaper.right - rPaper.left ;
+       m_maxY = rPaper.bottom - rPaper.top ;

 #else
 #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 ;
+       m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ;
+       m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ;

 #endif
 }
 
 #endif
 }
 


@@ -120,24 +165,24 @@ wxPrinterDC::~wxPrinterDC(void)
 #if !TARGET_CARBON
        if ( m_ok )
        {
 #if !TARGET_CARBON
        if ( m_ok )
        {

-               ::PrCloseDoc( m_macPrintPort  ) ;
+               ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;

                err = PrError() ;
                
                err = PrError() ;
                

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

                {
                {

-                       if ( (**m_printData.m_macPrintInfo).prJob.bJDocLoop == bSpoolLoop )
+                       if ( (**(THPrint)m_printData.m_macPrintSettings).prJob.bJDocLoop == bSpoolLoop )

                        {
                                TPrStatus status ;
                        {
                                TPrStatus status ;

-                               ::PrPicFile( m_printData.m_macPrintInfo , NULL , NULL , NULL , &status ) ;
+                               ::PrPicFile( (THPrint) m_printData.m_macPrintSettings , NULL , NULL , NULL , &status ) ;

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

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

                }
                }

-               ::UMAPrClose() ;
+               ::UMAPrClose(NULL) ;

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


@@ -145,24 +190,20 @@ wxPrinterDC::~wxPrinterDC(void)
        if ( m_ok ) 
        {
   #if PM_USE_SESSION_APIS
        if ( m_ok ) 
        {
   #if PM_USE_SESSION_APIS

-           err = PMSessionEndDocument(m_macPrintPort);
+           err = PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);

   #else
   #else

-           err = PMEndDocument(m_macPrintPort);
+           err = PMEndDocument(m_macPrintSessionPort);

   #endif
   #endif

-       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) ;

-  #if !TARGET_CARBON
-                       UMAPrClose() ;
-  #else
-                       UMAPrClose(&m_macPrintPort) ;
-  #endif
+                   dialog.ShowModal();

        }
        }

-  #if !TARGET_CARBON
-       UMAPrClose() ;
+  #if TARGET_CARBON && PM_USE_SESSION_APIS
+           UMAPrClose(&m_macPrintSessionPort) ;

   #else
   #else

-       UMAPrClose(&m_macPrintPort) ;
+           UMAPrClose(NULL) ;

   #endif
        }
 #endif
   #endif
        }
 #endif


@@ -202,44 +243,46 @@ void wxPrinterDC::StartPage(void)
        wxString message ;
 
 #if !TARGET_CARBON
        wxString message ;
 
 #if !TARGET_CARBON

-       PrOpenPage( m_macPrintPort , NULL ) ;
-       m_macLocalOrigin.h =  (**m_printData.m_macPrintInfo).rPaper.left ;
-       m_macLocalOrigin.v =  (**m_printData.m_macPrintInfo).rPaper.top ;
+       PrOpenPage( (TPPrPort) m_macPrintSessionPort , NULL ) ;
+       m_macLocalOrigin.x =  (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ;
+       m_macLocalOrigin.y =  (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ;

        
        

-       SetOrigin(  - m_macLocalOrigin.h , - m_macLocalOrigin.v  ) ;

        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  ) ;
-               ::UMAPrClose() ;
+               dialog.ShowModal();
+               ::PrClosePage( (TPPrPort) m_macPrintSessionPort ) ;
+               ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort ) ;
+               ::UMAPrClose(NULL) ;

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

-       err = PMSessionBeginPage(m_macPrintPort,
-                                m_printData.m_macPageFormat,
+       err = PMSessionBeginPage((PMPrintSession)m_macPrintSessionPort,
+                                (PMPageFormat)m_printData.m_macPageFormat,

                                 nil);
   #else
                                 nil);
   #else

-       err = PMBeginPage(m_macPrintPort, nil);
+       err = PMBeginPage(m_macPrintSessionPort, nil);

   #endif
   #endif

-       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();

   #if PM_USE_SESSION_APIS
   #if PM_USE_SESSION_APIS

-               PMSessionEndPage(m_macPrintPort);
-               PMSessionEndDocument(m_macPrintPort);
+               PMSessionEndPage((PMPrintSession)m_macPrintSessionPort);
+               PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
+               UMAPrClose(&m_macPrintSessionPort) ;

   #else
   #else

-               PMEndPage(m_macPrintPort);
-               PMEndDocument(m_macPrintPort);
+               PMEndPage(m_macPrintSessionPort);
+               PMEndDocument(m_macPrintSessionPort);
+               UMAPrClose(NULL) ;

   #endif
   #endif

-               UMAPrClose(&m_macPrintPort) ;

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


@@ -255,33 +298,36 @@ void wxPrinterDC::EndPage(void)
        wxString message ;
 
 #if !TARGET_CARBON
        wxString message ;
 
 #if !TARGET_CARBON

-       PrClosePage(  (TPrPort*) m_macPort ) ;
+       PrClosePage(  (TPPrPort) m_macPort ) ;

        err = PrError() ;
        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) ;

-               ::PrCloseDoc( m_macPrintPort  ) ;
-               ::UMAPrClose() ;
+               dialog.ShowModal();
+               ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;
+               ::UMAPrClose(NULL) ;

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

-       err = PMSessionEndPage(m_macPrintPort);
+       err = PMSessionEndPage((PMPrintSession)m_macPrintSessionPort);

   #else
   #else

-       err = PMEndPage(m_macPrintPort);
+       err = PMEndPage(m_macPrintSessionPort);

   #endif
   #endif

-       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();

   #if PM_USE_SESSION_APIS
   #if PM_USE_SESSION_APIS

-               PMSessionEndDocument(m_macPrintPort);
+               PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
+               UMAPrClose(&m_macPrintSessionPort) ;

   #else
   #else

-               PMEndDocument(m_macPrintPort);
+               PMEndDocument(m_macPrintSessionPort);
+               UMAPrClose(NULL) ;

   #endif
   #endif

-               UMAPrClose(&m_macPrintPort) ;

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