X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d5cfd0e64a2c09d957517405758de680806e674..8ba4faba4de4af7613911d83263b9470e5bb1207:/src/osx/cocoa/printdlg.mm?ds=sidebyside diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm index d10cea723a..d74128d3a9 100644 --- a/src/osx/cocoa/printdlg.mm +++ b/src/osx/cocoa/printdlg.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/printdlg.cpp +// Name: src/osx/cocoa/printdlg.mm // Purpose: wxPrintDialog, wxPageSetupDialog // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: printdlg.cpp 55419 2008-09-02 16:53:23Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -37,6 +37,7 @@ wxOSXCocoaPrintData::wxOSXCocoaPrintData() m_macPageFormat = (PMPageFormat) [m_macPrintInfo PMPageFormat]; m_macPrintSettings = (PMPrintSettings) [m_macPrintInfo PMPrintSettings]; m_macPrintSession = (PMPrintSession) [m_macPrintInfo PMPrintSession] ; + PMGetPageFormatPaper(m_macPageFormat, &m_macPaper); } wxOSXCocoaPrintData::~wxOSXCocoaPrintData() @@ -64,7 +65,7 @@ int wxMacPrintDialog::ShowModal() m_printDialogData.GetPrintData().ConvertToNative(); int result = wxID_CANCEL; - + NSPrintPanel* panel = [NSPrintPanel printPanel]; NSPrintInfo* printInfo = ((wxOSXCocoaPrintData*)m_printDialogData.GetPrintData().GetNativeData())->GetNSPrintInfo(); if ( (NSInteger)[panel runModalWithPrintInfo:printInfo] == NSOKButton ) @@ -92,7 +93,7 @@ int wxMacPageSetupDialog::ShowModal() m_pageSetupData.GetPrintData().ConvertFromNative(); m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() ); } - + return result; }