solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Initialize wxPrintData members in their declaration

Browse source 
No real changes, just initialize the members of this class when
declaring them too, for consistency with the other classes declared in
this header.
This commit is contained in:
Vadim Zeitlin 2023-03-22 18:16:34 +01:00
parent 4f1320fbf2
commit 34b20b8382
2 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
include/wx/cmndata.h
View file

@ -116,21 +116,24 @@ public:
wxPrintNativeDataBase *GetNativeData() const { return m_nativeData.get(); }
private:
wxPrintBin m_bin;
int m_media;
wxPrintMode m_printMode;
wxPrintBin m_bin = wxPRINTBIN_DEFAULT;
int m_media = wxPRINTMEDIA_DEFAULT;
wxPrintMode m_printMode = wxPRINT_MODE_PRINTER;
int m_printNoCopies;
wxPrintOrientation m_printOrientation;
bool m_printOrientationReversed;
bool m_printCollate;
int m_printNoCopies = 1;
wxPrintOrientation m_printOrientation = wxPORTRAIT;
bool m_printOrientationReversed = false;
bool m_printCollate = false;
wxString m_printerName;
bool m_colour;
wxDuplexMode m_duplexMode;
wxPrintQuality m_printQuality;
wxPaperSize m_paperId;
wxSize m_paperSize;
bool m_colour = true;
wxDuplexMode m_duplexMode = wxDUPLEX_SIMPLEX;
wxPrintQuality m_printQuality = wxPRINT_QUALITY_HIGH;
// we intentionally don't initialize paper id and size at all, like this
// the default system settings will be used for them
wxPaperSize m_paperId = wxPAPER_NONE;
wxSize m_paperSize = wxDefaultSize;
wxString m_filename;

18
src/common/cmndata.cpp
View file

@ -54,25 +54,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject);
// ----------------------------------------------------------------------------
wxPrintData::wxPrintData()
: m_paperSize(wxDefaultSize)
{
m_bin = wxPRINTBIN_DEFAULT;
m_media = wxPRINTMEDIA_DEFAULT;
m_printMode = wxPRINT_MODE_PRINTER;
m_printOrientation = wxPORTRAIT;
m_printOrientationReversed = false;
m_printNoCopies = 1;
m_printCollate = false;
// New, 24/3/99
m_colour = true;
m_duplexMode = wxDUPLEX_SIMPLEX;
m_printQuality = wxPRINT_QUALITY_HIGH;
// 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_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}