use GetText() instead of GetText(wxString&), made some methods inline

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

diff --git a/src/mac/dcprint.cpp b/src/mac/dcprint.cpp
index 257c74206b6a7707bae2d3479b742e1376374e50..904c5eedca7ea796554101642b49c6f489c17867 100644 (file)
--- a/src/mac/dcprint.cpp
+++ b/src/mac/dcprint.cpp
@@ -24,10 +24,10 @@
 #endif
 
 #include "wx/dcprint.h"
 #endif
 
 #include "wx/dcprint.h"

-#include "math.h"
+#include "wx/msgdlg.h"
+#include <math.h>

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-

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


@@ -36,22 +36,29 @@ GrafPtr macPrintFormerPort = NULL ;
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {

-#if !TARGET_CARBON
-       OSErr err ;
+       OSStatus err ;

        wxString message ;
        
        m_printData = printdata ;
        m_printData.ConvertToNative() ;
        wxString message ;
        
        m_printData = printdata ;
        m_printData.ConvertToNative() ;

-       
-       ::UMAPrOpen() ;
-       err = PrError() ;
+
+#if PM_USE_SESSION_APIS
+       err = UMAPrOpen(&m_macPrintPort) ;
+#else
+       err = UMAPrOpen() ;
+#endif

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

+#if PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintPort) ;
+#else

                UMAPrClose() ;
                UMAPrClose() ;

+#endif

        }
        
        }
        

+#if !TARGET_CARBON

        if ( ::PrValidate( m_printData.m_macPrintInfo ) )
        {
                ::PrStlDialog( m_printData.m_macPrintInfo ) ;
        if ( ::PrValidate( m_printData.m_macPrintInfo ) )
        {
                ::PrStlDialog( m_printData.m_macPrintInfo ) ;


@@ -75,23 +82,48 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        }
        // sets current port
        m_macPort = (GrafPtr ) m_macPrintPort ;
        }
        // sets current port
        m_macPort = (GrafPtr ) m_macPrintPort ;

+#else
+       m_macPrintPort = kPMNoReference ;
+  #if PM_USE_SESSION_APIS
+    err = PMSessionBeginDocument(
+       m_macPrintPort,
+       m_printData.m_macPrintSettings, 
+       m_printData.m_macPageFormat);
+  #else
+    err = PMBeginDocument(
+       m_printData.m_macPrintSettings, 
+       m_printData.m_macPageFormat, 
+       &m_macPrintPort);
+  #endif
+    if ( err != noErr || m_macPrintPort == kPMNoReference )
+    {
+               message.Printf( "Print Error %d", err ) ;
+               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+  #if PM_USE_SESSION_APIS
+               UMAPrClose(&m_macPrintPort) ;
+  #else
+               UMAPrClose() ;
+  #endif
+    }
+       // sets current port
+       ::GetPort( &m_macPort ) ;
+#endif

        m_ok = TRUE ;
        m_minY = m_minX = 0 ;
        m_ok = TRUE ;
        m_minY = m_minX = 0 ;

+#if TARGET_CARBON
+#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 = (**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
-#pragma warning "TODO:printing support for carbon"

 #endif
 }
 
 wxPrinterDC::~wxPrinterDC(void)
 {
 #endif
 }
 
 wxPrinterDC::~wxPrinterDC(void)
 {

+       OSStatus err ;
+       wxString message ;

 #if !TARGET_CARBON
        if ( m_ok )
        {
 #if !TARGET_CARBON
        if ( m_ok )
        {

-               OSErr err ;
-               wxString message ;
-       

                ::PrCloseDoc( m_macPrintPort  ) ;
                err = PrError() ;
                
                ::PrCloseDoc( m_macPrintPort  ) ;
                err = PrError() ;
                


@@ -112,10 +144,31 @@ wxPrinterDC::~wxPrinterDC(void)
                ::UMAPrClose() ;
 //       ::SetPort( macPrintFormerPort ) ;
                ::SetPort( LMGetWMgrPort() ) ;
                ::UMAPrClose() ;
 //       ::SetPort( macPrintFormerPort ) ;
                ::SetPort( LMGetWMgrPort() ) ;

-               m_macPortHelper.Clear() ;

        }
 #else
        }
 #else

-#pragma warning "TODO:printing support for carbon"
+       if ( m_ok ) 
+       {
+  #if PM_USE_SESSION_APIS
+           err = PMSessionEndDocument(m_macPrintPort);
+  #else
+           err = PMEndDocument(m_macPrintPort);
+  #endif
+       if ( !err )
+       {
+                       message.Printf( "Print Error %d", err ) ;
+                       wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+  #if PM_USE_SESSION_APIS
+                       UMAPrClose(&m_macPrintPort) ;
+  #else
+                       UMAPrClose() ;
+  #endif
+       }
+  #if PM_USE_SESSION_APIS
+       UMAPrClose(&m_macPrintPort) ;
+  #else
+           UMAPrClose() ;
+  #endif
+       }

 #endif
 }
 
 #endif
 }
 


@@ -130,7 +183,6 @@ void wxPrinterDC::EndDoc(void)
 
 void wxPrinterDC::StartPage(void) 
 {
 
 void wxPrinterDC::StartPage(void) 
 {

-#if !TARGET_CARBON

        if ( !m_ok )
                return ;
 
        if ( !m_ok )
                return ;
 


@@ -150,11 +202,15 @@ void wxPrinterDC::StartPage(void)
        m_macPenInstalled = false ;
 
                
        m_macPenInstalled = false ;
 
                

-       OSErr err ;
+       OSStatus err ;

        wxString message ;
 
        wxString message ;
 

+#if !TARGET_CARBON

        PrOpenPage( m_macPrintPort , NULL ) ;
        PrOpenPage( m_macPrintPort , NULL ) ;

-       SetOrigin(  - (**m_printData.m_macPrintInfo).rPaper.left , - (**m_printData.m_macPrintInfo).rPaper.top ) ;
+       m_macLocalOrigin.h =  (**m_printData.m_macPrintInfo).rPaper.left ;
+       m_macLocalOrigin.v =  (**m_printData.m_macPrintInfo).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() ;


@@ -169,19 +225,41 @@ void wxPrinterDC::StartPage(void)
                m_ok = FALSE ;
        }
 #else
                m_ok = FALSE ;
        }
 #else

-#pragma warning "TODO:printing support for carbon"
+  #if PM_USE_SESSION_APIS
+       err = PMSessionBeginPage(m_macPrintPort,
+                                m_printData.m_macPageFormat,
+                                nil);
+  #else
+       err = PMBeginPage(m_macPrintPort, nil);
+  #endif
+       if ( err )
+       {
+               message.Printf( "Print Error %d", err ) ;
+               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+  #if PM_USE_SESSION_APIS
+               PMSessionEndPage(m_macPrintPort);
+               PMSessionEndDocument(m_macPrintPort);
+               UMAPrClose(&m_macPrintPort) ;
+  #else
+               PMEndPage(m_macPrintPort);
+               PMEndDocument(m_macPrintPort);
+               UMAPrClose() ;
+  #endif
+               ::SetPort( macPrintFormerPort ) ;
+               m_ok = FALSE ;
+       }

 #endif
 }
 
 void wxPrinterDC::EndPage(void) 
 {
 #endif
 }
 
 void wxPrinterDC::EndPage(void) 
 {

-#if !TARGET_CARBON

        if ( !m_ok )
                return ;
 
        if ( !m_ok )
                return ;
 

-       OSErr err ;
+       OSStatus err ;

        wxString message ;
 
        wxString message ;
 

+#if !TARGET_CARBON

        PrClosePage(  (TPrPort*) m_macPort ) ;
        err = PrError() ;
        if ( err )
        PrClosePage(  (TPrPort*) m_macPort ) ;
        err = PrError() ;
        if ( err )


@@ -194,7 +272,25 @@ void wxPrinterDC::EndPage(void)
                m_ok = FALSE ;
        }
 #else
                m_ok = FALSE ;
        }
 #else

-#pragma warning "TODO:printing support for carbon"
+  #if PM_USE_SESSION_APIS
+       err = PMSessionEndPage(m_macPrintPort);
+  #else
+       err = PMEndPage(m_macPrintPort);
+  #endif
+       if ( err )
+       {
+               message.Printf( "Print Error %d", err ) ;
+               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+  #if PM_USE_SESSION_APIS
+               PMSessionEndDocument(m_macPrintPort);
+               UMAPrClose(&m_macPrintPort) ;
+  #else
+               PMEndDocument(m_macPrintPort);
+               UMAPrClose() ;
+  #endif
+               ::SetPort( macPrintFormerPort ) ;
+               m_ok = FALSE ;
+       }

 #endif
 
 }
 #endif
 
 }