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

Fix using custom paper format in wxOSX.

Browse Source 
Do actually use the custom paper object the code creates.

Closes #16959.
This commit is contained in:
Vadim Zeitlin
2015-04-21 15:48:17 +02:00
parent b6d3a64fae
commit c2543cd474
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -623,6 +623,7 @@ wxOSX:
- Compilation fix for wxWebView under 10.10. - Compilation fix for wxWebView under 10.10.
- Fix conversion of wxBitmap to wxImage in 64 bit builds. - Fix conversion of wxBitmap to wxImage in 64 bit builds.
- Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva). - Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).
- Fix custom paper support (tijsv).
3.0.2: (released 2014-10-06) 3.0.2: (released 2014-10-06)

14
src/osx/core/printmac.cpp
View File

@@ -198,8 +198,18 @@ void wxOSXPrintData::TransferPaperInfoFrom( const wxPrintData &data )
wxString id, name(wxT("Custom paper")); wxString id, name(wxT("Custom paper"));
id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y); id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y);
PMPaperCreateCustom(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ), if ( PMPaperCreateCustom
papersize.x, papersize.y, &margins, &paper); (
printer,
wxCFStringRef(id, wxFont::GetDefaultEncoding()),
wxCFStringRef(name, wxFont::GetDefaultEncoding()),
papersize.x, papersize.y,
&margins,
&paper
) )
{
bestPaper = paper;
}
} }
if ( bestPaper != kPMNoData ) if ( bestPaper != kPMNoData )
{ {