X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e158da36bd19d0859baa603c911bc065108d0a79..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/osx/printdlg_osx.cpp diff --git a/src/osx/printdlg_osx.cpp b/src/osx/printdlg_osx.cpp index 00e7bc3954..470a6567fc 100644 --- a/src/osx/printdlg_osx.cpp +++ b/src/osx/printdlg_osx.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: printdlg.cpp 58164 2009-01-17 08:46:00Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -67,10 +67,9 @@ bool wxMacPrintDialog::Create( wxWindow *p, wxPrintDialogData *data ) wxMacPrintDialog::~wxMacPrintDialog() { - if (m_destroyDC && m_printerDC) + if (m_destroyDC) { - delete m_printerDC; - m_printerDC = NULL; + wxDELETE(m_printerDC); } } @@ -81,13 +80,13 @@ wxDC *wxMacPrintDialog::GetPrintDC() IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase) -wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data ) +wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data ) : wxPageSetupDialogBase() { Create( p, data ); } -bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data ) +bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupDialogData *data ) { m_dialogParent = p; @@ -101,14 +100,14 @@ wxMacPageSetupDialog::~wxMacPageSetupDialog() { } -wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData() +wxPageSetupDialogData& wxMacPageSetupDialog::GetPageSetupDialogData() { return m_pageSetupData; } IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog) -wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) : +wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupDialogData *data) : wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))), m_pageSetupDialogData(data) { @@ -149,7 +148,7 @@ bool wxMacPageMarginsDialog::TransferToWindow() m_LeftMargin->SetFocus(); return true; } - + bool wxMacPageMarginsDialog::TransferDataFromWindow() { wxPoint topLeft, bottomRight; @@ -161,7 +160,7 @@ bool wxMacPageMarginsDialog::TransferDataFromWindow() m_pageSetupDialogData->SetMarginBottomRight(bottomRight); return true; } - + bool wxMacPageMarginsDialog::CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name) { long lvalue;