Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call CalculatePaperSizeFromId when SetPrintData or the assignment

Browse Source 
operator is used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-01-29 01:06:10 +00:00
parent 1db4e8dd8d
commit 24c5243d09
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cmndata.h
View File

@@ -431,7 +431,7 @@ public:
wxPageSetupDialogData& operator=(const wxPrintData& data); wxPageSetupDialogData& operator=(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }
void SetPrintData(const wxPrintData& printData) { m_printData = printData; } void SetPrintData(const wxPrintData& printData);
private: private:
wxSize m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?) wxSize m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)

7
src/common/cmndata.cpp
View File

@@ -610,6 +610,7 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogD
wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data) wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
{ {
m_printData = data; m_printData = data;
CalculatePaperSizeFromId();
return *this; return *this;
} }
@@ -661,6 +662,12 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
CalculatePaperSizeFromId(); CalculatePaperSizeFromId();
} }
void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
{
m_printData = printData;
CalculatePaperSizeFromId();
}
// Use paper size defined in this object to set the wxPrintData // Use paper size defined in this object to set the wxPrintData
// paper id // paper id
void wxPageSetupDialogData::CalculateIdFromPaperSize() void wxPageSetupDialogData::CalculateIdFromPaperSize()