X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..79da30927621c8ab01ff9e9a834331b922e7fbd1:/src/mac/carbon/printdlg.cpp

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index eae3b95568..ffe0ba15ba 100644
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -14,63 +14,177 @@
 #endif
 
 #include "wx/object.h"
-#include "wx/stubs/printdlg.h"
+#include "wx/printdlg.h"
 #include "wx/dcprint.h"
+#include "wx/msgdlg.h"
+#include "wx/mac/uma.h"
 
 // Use generic page setup dialog: use your own native one if one exists.
-#include "wx/generic/prntdlgg.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
 #endif
 
-wxPrintDialog::wxPrintDialog():
- wxDialog()
+wxPrintDialog::wxPrintDialog()
 {
     m_dialogParent = NULL;
     m_printerDC = NULL;
+    m_destroyDC = TRUE;
 }
 
-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data):
- wxDialog()
+wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)
 {
     Create(p, data);
 }
 
-bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
+wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
+{
+    wxPrintDialogData data2;
+    if ( data )
+        data2 = *data;
+
+    Create(p, &data2);
+}
+
+bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 {
     m_dialogParent = p;
     m_printerDC = NULL;
+    m_destroyDC = TRUE;
 
     if ( data )
-        m_printData = *data;
+        m_printDialogData = *data;
 
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {
-    if (m_printerDC)
+    if (m_destroyDC && m_printerDC)
         delete m_printerDC;
 }
 
 int wxPrintDialog::ShowModal()
 {
-    // TODO
-    return wxID_CANCEL;
+	int result = wxID_CANCEL ;
+	OSErr err ;
+	wxString message ;
+
+#if !TARGET_CARBON	
+	err = ::UMAPrOpen() ;
+	if ( err == noErr )
+	{
+		m_printDialogData.ConvertToNative() ;
+		if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )
+		{
+			m_printDialogData.ConvertFromNative() ;
+			result = wxID_OK ;
+		}
+
+	}
+	else
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
+	}
+	::UMAPrClose() ;
+#else
+  #if PM_USE_SESSION_APIS
+    PMPrintSession macPrintSession = kPMNoReference;
+    Boolean        accepted;
+    
+	err = ::UMAPrOpen(&macPrintSession) ;
+	if ( err == noErr )
+	{
+		m_printDialogData.ConvertToNative() ;
+		
+		//  Set up a valid PageFormat object.
+		if (m_printDialogData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
+		{
+	    	err = PMCreatePageFormat(&m_printDialogData.GetPrintData().m_macPageFormat);
+		
+	    	//  Note that PMPageFormat is not session-specific, but calling
+	    	//  PMSessionDefaultPageFormat assigns values specific to the printer
+	    	//  associated with the current printing session.
+	    	if ((err == noErr) &&
+	    	    (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
+	    	{
+	        	err = PMSessionDefaultPageFormat(macPrintSession,
+	            	  	m_printDialogData.GetPrintData().m_macPageFormat);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePageFormat(macPrintSession,
+	              	m_printDialogData.GetPrintData().m_macPageFormat,
+	              	kPMDontWantBoolean);
+		}
+	
+		//  Set up a valid PrintSettings object.
+		if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
+		{
+	    	err = PMCreatePrintSettings(&m_printDialogData.GetPrintData().m_macPrintSettings);
+
+	    	//  Note that PMPrintSettings is not session-specific, but calling
+	    	//  PMSessionDefaultPrintSettings assigns values specific to the printer
+	    	//  associated with the current printing session.
+	    	if ((err == noErr) &&
+	        	(m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings))
+	    	{
+	       	 err = PMSessionDefaultPrintSettings(macPrintSession,
+	                  m_printDialogData.GetPrintData().m_macPrintSettings);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePrintSettings(macPrintSession,
+	              	m_printDialogData.GetPrintData().m_macPrintSettings,
+	              	kPMDontWantBoolean);
+		}
+		//  Set a valid page range before displaying the Print dialog
+		if (err == noErr)
+		{
+		//    err = PMSetPageRange(m_printDialogData.GetPrintData().m_macPrintSettings,
+		//              minPage, maxPage);
+		}
+
+		//  Display the Print dialog.
+		if (err == noErr)
+		{
+	    	err = PMSessionPrintDialog(macPrintSession,
+	              	m_printDialogData.GetPrintData().m_macPrintSettings,
+	              	m_printDialogData.GetPrintData().m_macPageFormat,
+	              	&accepted);
+	    	if ((err == noErr) && !accepted)
+	    	{
+	        	err = kPMCancel; // user clicked Cancel button
+	    	}
+		}
+		if  ( err == noErr )
+		{
+			m_printDialogData.ConvertFromNative() ;
+			result = wxID_OK ;
+		}
+	}
+	if ((err != noErr) && (err != kPMCancel))
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
+	}
+	::UMAPrClose(&macPrintSession) ;
+  #else
+    #pragma warning "TODO: Printing for carbon without session apis"
+  #endif
+#endif
+	return result ;
 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
-  if (m_printerDC)
-  {
-    wxDC* dc = m_printerDC;
-    m_printerDC = NULL;
-    return dc;
-  }
-  else
-    return NULL;
+    return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
 }
 
 /*
@@ -105,11 +219,92 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
-    // Uses generic page setup dialog
-    wxGenericPageSetupDialog *genericPageSetupDialog = new wxGenericPageSetupDialog(GetParent(), & m_pageSetupData);
-    int ret = genericPageSetupDialog->ShowModal();
-    m_pageSetupData = genericPageSetupDialog->GetPageSetupData();
-    genericPageSetupDialog->Close(TRUE);
-    return ret;
+	int      result = wxID_CANCEL ;
+	OSErr    err ;
+	wxString message ;
+
+#if !TARGET_CARBON
+	err = ::UMAPrOpen() ;
+	if ( err == noErr )
+	{
+		m_pageSetupData.ConvertToNative() ;
+		if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )
+		{
+			m_pageSetupData.ConvertFromNative() ;
+			result = wxID_OK ;
+		}
+
+	}
+	else
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
+	}
+	::UMAPrClose() ;
+#else
+  #if PM_USE_SESSION_APIS
+    PMPrintSession macPrintSession = kPMNoReference;
+    Boolean        accepted;
+    
+	err = ::UMAPrOpen(&macPrintSession) ;
+	if ( err == noErr )
+	{
+		m_pageSetupData.ConvertToNative() ;
+
+		//  Set up a valid PageFormat object.
+		if (m_pageSetupData.GetPrintData().m_macPageFormat == kPMNoPageFormat)
+		{
+	    	err = PMCreatePageFormat(&m_pageSetupData.GetPrintData().m_macPageFormat);
+		
+	    	//  Note that PMPageFormat is not session-specific, but calling
+	    	//  PMSessionDefaultPageFormat assigns values specific to the printer
+	    	//  associated with the current printing session.
+	    	if ((err == noErr) &&
+	        	(m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
+	    	{
+	        	err = PMSessionDefaultPageFormat(macPrintSession,
+	            	  	m_pageSetupData.GetPrintData().m_macPageFormat);
+	    	}
+		}
+		else
+		{
+	    	err = PMSessionValidatePageFormat(macPrintSession,
+	              	m_pageSetupData.GetPrintData().m_macPageFormat,
+	              	kPMDontWantBoolean);
+		}
+
+		//  Display the Page Setup dialog.
+		if (err == noErr)
+		{
+	    	err = PMSessionPageSetupDialog(macPrintSession,
+	              	m_pageSetupData.GetPrintData().m_macPageFormat,
+	              	&accepted);
+	    	if ((err == noErr) && !accepted)
+	    	{
+	        	err = kPMCancel; // user clicked Cancel button
+	    	}
+		}   
+					
+		//  If the user did not cancel, flatten and save the PageFormat object
+		//  with our document.
+		if (err == noErr) {
+		//    err = FlattenAndSavePageFormat(m_pageSetupData.GetPrintData().m_macPageFormat);
+			m_pageSetupData.ConvertFromNative() ;
+			result = wxID_OK ;
+		}
+	}
+	if ((err != noErr) && (err != kPMCancel))
+	{
+		message.Printf( "Print Error %d", err ) ;
+		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+		dialog.ShowModal();
+	}
+	::UMAPrClose(&macPrintSession) ;
+  #else
+    #pragma warning "TODO: Printing for carbon without session apis"
+  #endif
+#endif
+	return result ;
 }