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

changing code that doesn't work on 10.5 as advertised

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-12-18 15:33:36 +00:00
parent 26dfebbd6c
commit cfc65f264a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mac/carbon/printmac.cpp
View File

@@ -176,10 +176,11 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
PMResolution res; PMResolution res;
PMPrinter printer; PMPrinter printer;
PMSessionGetCurrentPrinter(m_macPrintSession, &printer); PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 #if 0 // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
PMPrinterGetOutputResolution( printer, PMPrinterGetOutputResolution( printer,
(PMPrintSettings) m_macPrintSettings, &res) ; (PMPrintSettings) m_macPrintSettings, &res) ;
// TODO transfer ? into page format ? // TODO transfer ? into page format ?
// may fail !
#else #else
PMTag tag = kPMMaxSquareResolution; PMTag tag = kPMMaxSquareResolution;
PMPrinterGetPrinterResolution(printer, tag, &res); PMPrinterGetPrinterResolution(printer, tag, &res);
@@ -415,7 +416,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
PMResolution res; PMResolution res;
wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*) wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
(m_printDialogData.GetPrintData().GetNativeData()); (m_printDialogData.GetPrintData().GetNativeData());
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 #if 0 // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
PMPrinter printer; PMPrinter printer;
PMSessionGetCurrentPrinter(nativeData->m_macPrintSession, &printer); PMSessionGetCurrentPrinter(nativeData->m_macPrintSession, &printer);
PMPrinterGetOutputResolution( printer, nativeData->m_macPrintSettings, &res) ; PMPrinterGetOutputResolution( printer, nativeData->m_macPrintSettings, &res) ;