Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / carbon / dcprint.cpp

diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp
index 3c400a2aba62ddeb647eb8286150bc1d3761f235..51cd175ff1794f3017eb80ad94c4ea07f6dfbf3e 100644 (file)
--- a/src/osx/carbon/dcprint.cpp
+++ b/src/osx/carbon/dcprint.cpp
@@ -105,6 +105,10 @@ wxMacCarbonPrinterDC::wxMacCarbonPrinterDC( wxPrintData* data )
         {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
             m_err = PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res);
         {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
             m_err = PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res);

+            if ( m_err != noErr )
+            {
+                m_err = PMGetResolution((PMPageFormat) (native->GetPageFormat()), &res);
+            }

 #endif
         }
     }
 #endif
         }
     }


@@ -168,7 +172,10 @@ bool wxMacCarbonPrinterDC::StartDoc(  wxPrinterDC* dc , const wxString& message
 #endif
         {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 #endif
         {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

-            m_err = PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res);
+            if ( PMPrinterGetPrinterResolution(printer, kPMCurrentValue, &res) != noErr )
+            {
+                res.hRes = res.vRes = 300;
+            }

 #endif
         }
     }
 #endif
         }
     }