mac adaptions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/mac/printdlg.h"
|
||||
#include "wx/printdlg.h"
|
||||
#include "wx/dcprint.h"
|
||||
|
||||
// Use generic page setup dialog: use your own native one if one exists.
|
||||
@@ -24,30 +24,43 @@ 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_destroyDC && m_printerDC)
|
||||
delete m_printerDC;
|
||||
}
|
||||
|
||||
int wxPrintDialog::ShowModal()
|
||||
@@ -60,10 +73,10 @@ int wxPrintDialog::ShowModal()
|
||||
|
||||
if ( !err )
|
||||
{
|
||||
m_printData.ConvertToNative() ;
|
||||
if ( m_printData.macPrintInfo && ::PrJobDialog( m_printData.macPrintInfo ) )
|
||||
m_printDialogData.ConvertToNative() ;
|
||||
if ( m_printDialogData.m_macPrintInfo && ::PrJobDialog( m_printDialogData.m_macPrintInfo ) )
|
||||
{
|
||||
m_printData.ConvertFromNative() ;
|
||||
m_printDialogData.ConvertFromNative() ;
|
||||
result = wxID_OK ;
|
||||
}
|
||||
|
||||
@@ -80,7 +93,7 @@ int wxPrintDialog::ShowModal()
|
||||
|
||||
wxDC *wxPrintDialog::GetPrintDC()
|
||||
{
|
||||
return new wxPrinterDC( m_printData ) ;
|
||||
return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user