X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72e7876ba5ad16a1b03bb2449ea7886ec648854a..3ce946d47ef03fcf330b0a28c0ff815ea480da55:/src/mac/carbon/dcprint.cpp

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 2b0bf64c50..1467c4970f 100644
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -24,8 +24,9 @@
 #endif
 
 #include "wx/dcprint.h"
-#include "math.h"
-
+#include "wx/msgdlg.h"
+#include <math.h>
+#include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
@@ -35,23 +36,24 @@ GrafPtr macPrintFormerPort = NULL ;
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {
-	OSErr err ;
+	OSStatus err ;
 	wxString message ;
 	
 	m_printData = printdata ;
 	m_printData.ConvertToNative() ;
 	
-	::PrOpen() ;
-	err = PrError() ;
+	err = UMAPrOpen() ;
 	if ( err )
 	{
 		message.Printf( "Print Error %d", err ) ;
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-		PrClose() ;
+		UMAPrClose() ;
 	}
 	
+#if !TARGET_CARBON
 	if ( ::PrValidate( m_printData.m_macPrintInfo ) )
 	{
+		::PrStlDialog( m_printData.m_macPrintInfo ) ;
 		// the driver has changed in the mean time, should we pop up a page setup dialog ?
 	}
 	err = PrError() ;
@@ -59,25 +61,50 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 	{
 		message.Printf( "Print Error %d", err ) ;
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-		PrClose() ;
+		UMAPrClose() ;
 	}
 	::GetPort( &macPrintFormerPort ) ;
 	m_macPrintPort = ::PrOpenDoc( m_printData.m_macPrintInfo , NULL , NULL ) ;
+	err = PrError() ;
+	if ( err )
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		UMAPrClose() ;
+	}
 	// sets current port
 	m_macPort = (GrafPtr ) m_macPrintPort ;
+#else
+	m_macPrintPort = kPMNoReference ;
+    err = PMBeginDocument(
+    	m_printData.m_macPrintSettings, 
+    	m_printData.m_macPageFormat, 
+    	&m_macPrintPort);
+    if ( err != noErr || m_macPrintPort == kPMNoReference )
+    {
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		UMAPrClose() ;
+    }
+	// sets current port
+	::GetPort( &m_macPort ) ;
+#endif
 	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 ;
+#endif
 }
 
 wxPrinterDC::~wxPrinterDC(void)
 {
+	OSStatus err ;
+	wxString message ;
+#if !TARGET_CARBON
 	if ( m_ok )
 	{
-		OSErr err ;
-		wxString message ;
-	
 		::PrCloseDoc( m_macPrintPort  ) ;
 		err = PrError() ;
 		
@@ -93,11 +120,25 @@ wxPrinterDC::~wxPrinterDC(void)
 		{
 			message.Printf( "Print Error %d", err ) ;
 			wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-			PrClose() ;
+			UMAPrClose() ;
 		}
-		::PrClose() ;
-	  ::SetPort( macPrintFormerPort ) ;
+		::UMAPrClose() ;
+//	  ::SetPort( macPrintFormerPort ) ;
+		::SetPort( LMGetWMgrPort() ) ;
 	}
+#else
+	if ( m_ok ) 
+	{
+     	err = PMEndDocument(m_macPrintPort);
+     	if ( !err )
+     	{
+			message.Printf( "Print Error %d", err ) ;
+			wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+			UMAPrClose() ;
+     	}
+     	UMAPrClose() ;
+	}
+#endif
 }
 
 bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) ) 
@@ -113,12 +154,32 @@ void wxPrinterDC::StartPage(void)
 {
 	if ( !m_ok )
 		return ;
+
+  	m_logicalFunction = wxCOPY;
+//  m_textAlignment = wxALIGN_TOP_LEFT;
+  	m_backgroundMode = wxTRANSPARENT;
+  
+  	m_textForegroundColour = *wxBLACK;
+  	m_textBackgroundColour = *wxWHITE;
+  	m_pen = *wxBLACK_PEN;
+  	m_font = *wxNORMAL_FONT;
+  	m_brush = *wxTRANSPARENT_BRUSH;
+  	m_backgroundBrush = *wxWHITE_BRUSH;
+    
+	m_macFontInstalled = false ;
+	m_macBrushInstalled = false ;
+	m_macPenInstalled = false ;
+
 		
-	OSErr err ;
+	OSStatus err ;
 	wxString message ;
 
-  PrOpenPage( m_macPrintPort , NULL ) ;
-	SetOrigin(  - (**m_printData.m_macPrintInfo).rPaper.left , - (**m_printData.m_macPrintInfo).rPaper.top ) ;
+#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 ;
+  	
+	SetOrigin(  - m_macLocalOrigin.h , - m_macLocalOrigin.v  ) ;
 	Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
 	::ClipRect( &clip ) ;
 	err = PrError() ;
@@ -128,10 +189,23 @@ void wxPrinterDC::StartPage(void)
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
    		::PrClosePage(  m_macPrintPort) ;
 		::PrCloseDoc( m_macPrintPort  ) ;
-		::PrClose() ;
+		::UMAPrClose() ;
+	   	::SetPort( macPrintFormerPort ) ;
+	   	m_ok = FALSE ;
+	}
+#else
+    err = PMBeginPage(m_macPrintPort, nil);
+	if ( err )
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+   		PMEndPage(m_macPrintPort);
+		PMEndDocument(m_macPrintPort);
+		UMAPrClose() ;
 	   	::SetPort( macPrintFormerPort ) ;
 	   	m_ok = FALSE ;
 	}
+#endif
 }
 
 void wxPrinterDC::EndPage(void) 
@@ -139,9 +213,10 @@ void wxPrinterDC::EndPage(void)
 	if ( !m_ok )
 		return ;
 
-	OSErr err ;
+	OSStatus err ;
 	wxString message ;
 
+#if !TARGET_CARBON
    	PrClosePage(  (TPrPort*) m_macPort ) ;
 	err = PrError() ;
 	if ( err )
@@ -149,8 +224,21 @@ void wxPrinterDC::EndPage(void)
 		message.Printf( "Print Error %d", err ) ;
 		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
 		::PrCloseDoc( m_macPrintPort  ) ;
-		::PrClose() ;
+		::UMAPrClose() ;
 	   	::SetPort( macPrintFormerPort ) ;
 	   	m_ok = FALSE ;
 	}
+#else
+	err = PMEndPage(m_macPrintPort);
+	if ( err )
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		PMEndDocument(m_macPrintPort);
+		UMAPrClose() ;
+	   	::SetPort( macPrintFormerPort ) ;
+	   	m_ok = FALSE ;
+	}
+#endif
+
 }