X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d46359178b28cd86e189e877015a8e69ff5bbaa..0c1cc9483ecba053bc9a0983a4a8d48898e334f2:/src/mac/carbon/printmac.cpp?ds=inline diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp index 606e813946..1de459588a 100644 --- a/src/mac/carbon/printmac.cpp +++ b/src/mac/carbon/printmac.cpp @@ -80,12 +80,12 @@ void wxMacCarbonPrintData::ValidateOrCreate() OSStatus err = noErr ; if ( m_macPrintSession == kPMNoReference ) { - err = PMCreateSession( (PMPrintSession *) &m_macPrintSession ) ; + err = PMCreateSession( &m_macPrintSession ) ; } // Set up a valid PageFormat object. if ( m_macPageFormat == kPMNoPageFormat) { - err = PMCreatePageFormat((PMPageFormat *) &m_macPageFormat); + err = PMCreatePageFormat(&m_macPageFormat); // Note that PMPageFormat is not session-specific, but calling // PMSessionDefaultPageFormat assigns values specific to the printer @@ -93,21 +93,21 @@ void wxMacCarbonPrintData::ValidateOrCreate() if ((err == noErr) && ( m_macPageFormat != kPMNoPageFormat)) { - err = PMSessionDefaultPageFormat((PMPrintSession) m_macPrintSession, - (PMPageFormat) m_macPageFormat); + err = PMSessionDefaultPageFormat(m_macPrintSession, + m_macPageFormat); } } else { - err = PMSessionValidatePageFormat((PMPrintSession) m_macPrintSession, - (PMPageFormat) m_macPageFormat, + err = PMSessionValidatePageFormat(m_macPrintSession, + m_macPageFormat, kPMDontWantBoolean); } // Set up a valid PrintSettings object. if ( m_macPrintSettings == kPMNoPrintSettings) { - err = PMCreatePrintSettings((PMPrintSettings *) &m_macPrintSettings); + err = PMCreatePrintSettings( &m_macPrintSettings); // Note that PMPrintSettings is not session-specific, but calling // PMSessionDefaultPrintSettings assigns values specific to the printer @@ -115,14 +115,14 @@ void wxMacCarbonPrintData::ValidateOrCreate() if ((err == noErr) && ( m_macPrintSettings != kPMNoPrintSettings)) { - err = PMSessionDefaultPrintSettings((PMPrintSession) m_macPrintSession, - (PMPrintSettings) m_macPrintSettings); + err = PMSessionDefaultPrintSettings(m_macPrintSession, + m_macPrintSettings); } } else { - err = PMSessionValidatePrintSettings((PMPrintSession) m_macPrintSession, - (PMPrintSettings) m_macPrintSettings, + err = PMSessionValidatePrintSettings( m_macPrintSession, + m_macPrintSettings, kPMDontWantBoolean); } } @@ -140,7 +140,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data ) // collate cannot be set #if 0 // not yet tested if ( !m_printerName.empty() ) - PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ; + PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxCFStringRef( m_printerName , wxFont::GetDefaultEncoding() ) ) ; #endif #ifndef __LP64__ PMColorMode color ; @@ -154,36 +154,33 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data ) PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ; #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( PMSetDuplex!=NULL ) + PMDuplexMode mode = 0 ; + switch( data.GetDuplex() ) { - PMDuplexMode mode = 0 ; - switch( data.GetDuplex() ) - { - case wxDUPLEX_HORIZONTAL : - mode = kPMDuplexNoTumble ; - break ; - case wxDUPLEX_VERTICAL : - mode = kPMDuplexTumble ; - break ; - case wxDUPLEX_SIMPLEX : - default : - mode = kPMDuplexNone ; - break ; - } - PMSetDuplex( (PMPrintSettings) m_macPrintSettings, mode ) ; + case wxDUPLEX_HORIZONTAL : + mode = kPMDuplexNoTumble ; + break ; + case wxDUPLEX_VERTICAL : + mode = kPMDuplexTumble ; + break ; + case wxDUPLEX_SIMPLEX : + default : + mode = kPMDuplexNone ; + break ; } -#endif + PMSetDuplex( (PMPrintSettings) m_macPrintSettings, mode ) ; + // PMQualityMode not yet accessible via API // todo paperSize PMResolution res; PMPrinter 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, (PMPrintSettings) m_macPrintSettings, &res) ; // TODO transfer ? into page format ? + // may fail ! #else PMTag tag = kPMMaxSquareResolution; PMPrinterGetPrinterResolution(printer, tag, &res); @@ -226,7 +223,7 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data ) // collate cannot be set #if 0 { - wxMacCFStringHolder name ; + wxCFStringRef name ; PMPrinter printer ; PMSessionGetCurrentPrinter( m_macPrintSession , &printer ) ; @@ -240,26 +237,21 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data ) if ( err == noErr ) data.SetColour( !(color == kPMBlackAndWhite) ) ; #endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( PMGetDuplex!=NULL ) + PMDuplexMode mode = 0 ; + PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ; + switch( mode ) { - PMDuplexMode mode = 0 ; - PMGetDuplex( (PMPrintSettings) m_macPrintSettings, &mode ) ; - switch( mode ) - { - case kPMDuplexNoTumble : - data.SetDuplex(wxDUPLEX_HORIZONTAL); - break ; - case kPMDuplexTumble : - data.SetDuplex(wxDUPLEX_VERTICAL); - break ; - case kPMDuplexNone : - default : - data.SetDuplex(wxDUPLEX_SIMPLEX); - break ; - } + case kPMDuplexNoTumble : + data.SetDuplex(wxDUPLEX_HORIZONTAL); + break ; + case kPMDuplexTumble : + data.SetDuplex(wxDUPLEX_VERTICAL); + break ; + case kPMDuplexNone : + default : + data.SetDuplex(wxDUPLEX_SIMPLEX); + break ; } -#endif // PMQualityMode not yet accessible via API PMPaper paper ; @@ -412,7 +404,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) } // May have pressed cancel. - if (!dc || !dc->Ok()) + if (!dc || !dc->IsOk()) { if (dc) delete dc; @@ -424,7 +416,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) PMResolution res; wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*) (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; PMSessionGetCurrentPrinter(nativeData->m_macPrintSession, &printer); PMPrinterGetOutputResolution( printer, nativeData->m_macPrintSettings, &res) ; @@ -509,17 +501,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) } else { - if ( UMAGetSystemVersion() >= 0x1000 ) - { -#if !wxMAC_USE_CORE_GRAPHICS - GrafPtr thePort ; - GetPort( &thePort ) ; -#endif - wxSafeYield(win,true); -#if !wxMAC_USE_CORE_GRAPHICS - SetPort( thePort ) ; -#endif - } + wxSafeYield(win,true); dc->StartPage(); keepGoing = printout->OnPrintPage(pn); dc->EndPage(); @@ -625,7 +607,7 @@ void wxMacPrintPreview::DetermineScaling(void) // Get a device context for the currently selected printer wxPrinterDC printerDC(m_printDialogData.GetPrintData()); - if (printerDC.Ok()) + if (printerDC.IsOk()) { printerDC.GetSizeMM(&ww, &hh); printerDC.GetSize( &w , &h ) ;