X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbe4a80c57a77b249ef32117efe9fd923066f958..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/printmac.cpp

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index b36d26916c..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);
     }
 }
@@ -176,10 +176,11 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     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);
@@ -415,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) ;