X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..d6c9c1b71e069396bbe3850862de9aa10e6812e0:/src/mac/printdlg.cpp diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp index eae3b95568..a5c41e0737 100644 --- a/src/mac/printdlg.cpp +++ b/src/mac/printdlg.cpp @@ -14,63 +14,91 @@ #endif #include "wx/object.h" -#include "wx/stubs/printdlg.h" +#include "wx/printdlg.h" #include "wx/dcprint.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 ; + #if !TARGET_CARBON + + OSErr err ; + wxString message ; + ::UMAPrOpen() ; + err = PrError() ; + + if ( !err ) + { + 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) ; + } + ::UMAPrClose() ; + #else + #pragma warning "TODO:Printing for carbon" + #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 +133,33 @@ 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 ; +#if !TARGET_CARBON + + OSErr err ; + wxString message ; + ::UMAPrOpen() ; + err = PrError() ; + + if ( !err ) + { + 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) ; + } + ::UMAPrClose() ; +#else +#pragma warning "TODO:printing for carbon" +#endif + return result ; }