X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d50343d87bec1ad537a74c43e2ed2a114574a5a..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/printdlg.cpp diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp index 1417d0e6f0..87632fc308 100644 --- a/src/mac/carbon/printdlg.cpp +++ b/src/mac/carbon/printdlg.cpp @@ -13,15 +13,20 @@ #if wxUSE_PRINTING_ARCHITECTURE -#ifndef WXPRECOMP +#include "wx/printdlg.h" + +#ifndef WX_PRECOMP #include "wx/object.h" #include "wx/dcprint.h" + #include "wx/msgdlg.h" + #include "wx/textctrl.h" + #include "wx/sizer.h" + #include "wx/stattext.h" #endif -#include "wx/printdlg.h" #include "wx/mac/printdlg.h" -#include "wx/msgdlg.h" #include "wx/mac/private/print.h" +#include "wx/statline.h" // Use generic page setup dialog: use your own native one if one exists. @@ -77,9 +82,12 @@ int wxMacPrintDialog::ShowModal() ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData ); int result = wxID_CANCEL; + +#ifdef __LP64__ + // TODO use NSPrintPanel +#else OSErr err = noErr; Boolean accepted; - err = PMSessionPrintDialog( ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession, ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSettings, @@ -111,24 +119,24 @@ int wxMacPrintDialog::ShowModal() m_printDialogData.GetPrintData().ConvertFromNative(); ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferTo( &m_printDialogData ); } - +#endif return result; } -wxDC * wxMacPrintDialog::GetPrintDC() +wxDC *wxMacPrintDialog::GetPrintDC() { return new wxPrinterDC( m_printDialogData.GetPrintData() ); } IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase) -wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data ) +wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data ) : wxPageSetupDialogBase() { Create( p, data ); } -bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupDialogData *data ) +bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data ) { m_dialogParent = p; @@ -153,6 +161,8 @@ int wxMacPageSetupDialog::ShowModal() ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData ); int result = wxID_CANCEL; +#ifdef __LP64__ +#else OSErr err = noErr; Boolean accepted; @@ -189,8 +199,93 @@ int wxMacPageSetupDialog::ShowModal() m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() ); ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferTo( &m_pageSetupData ); } - +#endif return result; } + +IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog) + +wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) : + wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))), + m_pageSetupDialogData(data) + { + GetMinMargins(); + wxBoxSizer *colSizer = new wxBoxSizer(wxVERTICAL); + wxFlexGridSizer *gridSizer = new wxFlexGridSizer(4, 5, 5); + colSizer->Add(gridSizer, wxSizerFlags().Border(wxALL, 5)); + gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Left (mm):")), wxSizerFlags().Right()); + gridSizer->Add(m_LeftMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left()); + gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Top (mm):")), wxSizerFlags().Right()); + gridSizer->Add(m_TopMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left()); + gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Right (mm):")), wxSizerFlags().Right()); + gridSizer->Add(m_RightMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left()); + gridSizer->Add(new wxStaticText(this, wxID_ANY, wxT("Bottom (mm):")), wxSizerFlags().Right()); + gridSizer->Add(m_BottomMargin = new wxTextCtrl(this, wxID_ANY), wxSizerFlags().Left()); + colSizer->Add(new wxStaticLine(this), wxSizerFlags().Expand().Border(wxTOP|wxBOTTOM, 5)); + colSizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Expand().Border(wxALL, 5)); + TransferToWindow(); + SetSizerAndFit(colSizer); + Center(wxBOTH); + } + +bool wxMacPageMarginsDialog::TransferToWindow() + { + wxASSERT(m_pageSetupDialogData); + wxPoint topLeft = m_pageSetupDialogData->GetMarginTopLeft(); + wxPoint bottomRight = m_pageSetupDialogData->GetMarginBottomRight(); + wxPoint minTopLeft = m_pageSetupDialogData->GetMinMarginTopLeft(); + wxPoint minBottomRight = m_pageSetupDialogData->GetMinMarginBottomRight(); + m_LeftMargin->SetValue(wxString::Format(wxT("%d"), wxMax(topLeft.x, minTopLeft.x))); + m_LeftMargin->SetSelection(-1, -1); + m_TopMargin->SetValue(wxString::Format(wxT("%d"), wxMax(topLeft.y, minTopLeft.y))); + m_TopMargin->SetSelection(-1, -1); + m_RightMargin->SetValue(wxString::Format(wxT("%d"), wxMax(bottomRight.x, minBottomRight.x))); + m_RightMargin->SetSelection(-1, -1); + m_BottomMargin->SetValue(wxString::Format(wxT("%d"), wxMax(bottomRight.y, minBottomRight.y))); + m_BottomMargin->SetSelection(-1, -1); + m_LeftMargin->SetFocus(); + return true; + } + +bool wxMacPageMarginsDialog::TransferDataFromWindow() + { + wxPoint topLeft, bottomRight; + if (!CheckValue(m_LeftMargin, &topLeft.x, m_MinMarginTopLeft.x, wxT("left margin"))) return false; + if (!CheckValue(m_TopMargin, &topLeft.y, m_MinMarginTopLeft.y, wxT("top margin"))) return false; + if (!CheckValue(m_RightMargin, &bottomRight.x, m_MinMarginBottomRight.x, wxT("right margin"))) return false; + if (!CheckValue(m_BottomMargin, &bottomRight.y, m_MinMarginBottomRight.y, wxT("bottom margin"))) return false; + m_pageSetupDialogData->SetMarginTopLeft(topLeft); + m_pageSetupDialogData->SetMarginBottomRight(bottomRight); + return true; + } + +bool wxMacPageMarginsDialog::CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name) + { + long lvalue; + if (!textCtrl->GetValue().ToLong(&lvalue)) + { + wxMessageBox(wxString::Format(wxT("Sorry, \"%s\" is not a valid numerical value for the %s"), textCtrl->GetValue().c_str(), name.c_str()), wxT("Page Margin Error")); + return false; + } + if (lvalue < minValue) + { + wxMessageBox(wxString::Format(wxT("Sorry, \"%s\" is not a valid value for the %s, which must be >= %d"), textCtrl->GetValue().c_str(), name.c_str(), minValue), wxT("Page Margin Error")); + textCtrl->SetValue(wxString::Format(wxT("%d"), minValue)); + textCtrl->SetSelection(-1, -1); + textCtrl->SetFocus(); + return false; + } + *value = int(lvalue); + return true; + } + +void wxMacPageMarginsDialog::GetMinMargins() + { + m_MinMarginTopLeft = m_pageSetupDialogData->GetMinMarginTopLeft(); + m_MinMarginBottomRight = m_pageSetupDialogData->GetMinMarginBottomRight(); + } + + + #endif