#include "wx/cmndata.h"
#ifndef WX_PRECOMP
+ #if defined(__WXMSW__)
+ #include "wx/msw/wrapcdlg.h"
+ #endif // MSW
#include <stdio.h>
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
+ #include "wx/gdicmn.h"
#endif
-#include "wx/gdicmn.h"
#include "wx/prntbase.h"
#include "wx/printdlg.h"
#endif // wxUSE_FONTDLG
#if wxUSE_PRINTING_ARCHITECTURE
- #include "wx/paper.h"
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#if defined(__WXMSW__)
- #include "wx/msw/wrapcdlg.h"
-#endif // MSW
- #if wxUSE_PRINTING_ARCHITECTURE
+#include "wx/paper.h"
#if defined(__WXMAC__)
#include "wx/mac/private/print.h"
#endif
- IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
- #endif // wxUSE_PRINTING_ARCHITECTURE
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
// ============================================================================
// implementation
wxPrintData::wxPrintData()
{
m_bin = wxPRINTBIN_DEFAULT;
+ m_media = wxPRINTMEDIA_DEFAULT;
m_printMode = wxPRINT_MODE_PRINTER;
m_printOrientation = wxPORTRAIT;
m_printNoCopies = 1;
m_colour = true;
m_duplexMode = wxDUPLEX_SIMPLEX;
m_printQuality = wxPRINT_QUALITY_HIGH;
- m_paperId = wxPAPER_A4;
- m_paperSize = wxSize(210, 297);
+
+ // we intentionally don't initialize paper id and size at all, like this
+ // the default system settings will be used for them
+ m_paperId = wxPAPER_NONE;
+ m_paperSize = wxDefaultSize;
m_privData = NULL;
m_privDataLen = 0;
m_paperId = data.m_paperId;
m_paperSize = data.m_paperSize;
m_bin = data.m_bin;
+ m_media = data.m_media;
m_printMode = data.m_printMode;
m_filename = data.m_filename;
}
// Is this data OK for showing the print dialog?
-bool wxPrintData::Ok() const
+bool wxPrintData::IsOk() const
{
m_nativeData->TransferFrom( *this );