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

Add wxHtmlPrintout::SetMargins(wxPageSetupDialogData) overload

Browse Source 
Make it simpler to set the user-configured margins.

Closes #16872.
This commit is contained in:
Troels Knakkergaard
2016-03-05 03:33:08 +01:00
committed by Vadim Zeitlin
parent 10a2049093
commit c9a3a23e5a
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/html/htmprint.h
View File

@@ -156,9 +156,11 @@ public:
void SetMargins(float top = 25.2f, float bottom = 25.2f, float left = 25.2f, float right = 25.2f, void SetMargins(float top = 25.2f, float bottom = 25.2f, float left = 25.2f, float right = 25.2f,
float spaces = 5); float spaces = 5);
// sets margins in milimeters. Defaults to 1 inch for margins and 0.5cm for space // sets margins in millimeters. Defaults to 1 inch for margins and 0.5cm for space
// between text and header and/or footer // between text and header and/or footer
void SetMargins(const wxPageSetupDialogData& pageSetupData);
// wxPrintout stuff: // wxPrintout stuff:
bool OnPrintPage(int page) wxOVERRIDE; bool OnPrintPage(int page) wxOVERRIDE;
bool HasPage(int page) wxOVERRIDE; bool HasPage(int page) wxOVERRIDE;

7
interface/wx/html/htmprint.h
View File

@@ -444,5 +444,12 @@ public:
float left = 25.2, float left = 25.2,
float right = 25.2, float right = 25.2,
float spaces = 5); float spaces = 5);
/**
Sets margins from wxPageSetupDialogData.
@since 3.1.0
*/
void SetMargins(const wxPageSetupDialogData& pageSetupData);
}; };

14
src/html/htmprint.cpp
View File

@@ -593,8 +593,13 @@ void wxHtmlPrintout::SetMargins(float top, float bottom, float left, float right
m_MarginSpace = spaces; m_MarginSpace = spaces;
} }
void wxHtmlPrintout::SetMargins(const wxPageSetupDialogData& pageSetupData)
{
SetMargins(pageSetupData.GetMarginTopLeft().y,
pageSetupData.GetMarginBottomRight().y,
pageSetupData.GetMarginTopLeft().x,
pageSetupData.GetMarginBottomRight().x);
}
void wxHtmlPrintout::SetFonts(const wxString& normal_face, const wxString& fixed_face, void wxHtmlPrintout::SetFonts(const wxString& normal_face, const wxString& fixed_face,
const int *sizes) const int *sizes)
@@ -818,10 +823,7 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
p->SetFooter(m_Footers[0], wxPAGE_EVEN); p->SetFooter(m_Footers[0], wxPAGE_EVEN);
p->SetFooter(m_Footers[1], wxPAGE_ODD); p->SetFooter(m_Footers[1], wxPAGE_ODD);
p->SetMargins(m_PageSetupData->GetMarginTopLeft().y, p->SetMargins(*m_PageSetupData);
m_PageSetupData->GetMarginBottomRight().y,
m_PageSetupData->GetMarginTopLeft().x,
m_PageSetupData->GetMarginBottomRight().x);
return p; return p;
} }