From a49a8a3f2fe83a3b4b38528ee88d1f4b6b006f33 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 21 Apr 2015 15:46:40 +0200
Subject: [PATCH] Fix using custom paper format in wxOSX.

Do actually use the custom paper object the code creates.

Closes #16959.
---
 src/osx/core/printmac.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index abdea84e87..3c98a272f4 100644
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -198,8 +198,18 @@ void wxOSXPrintData::TransferPaperInfoFrom( const wxPrintData &data )
                     wxString id, name(wxT("Custom paper"));
                     id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y);
 
-                    PMPaperCreateCustom(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ),
-                                            papersize.x, papersize.y, &margins, &paper);
+                    if ( PMPaperCreateCustom
+                         (
+                            printer,
+                            wxCFStringRef(id, wxFont::GetDefaultEncoding()),
+                            wxCFStringRef(name, wxFont::GetDefaultEncoding()),
+                            papersize.x, papersize.y,
+                            &margins,
+                            &paper
+                         ) )
+                    {
+                        bestPaper = paper;
+                    }
                 }
                 if ( bestPaper != kPMNoData )
                 {