added test for env var expansion

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index 7f093c6e718748d43520556e1dab0fe2385f5c7a..6c32de8ad07f773c2225d7efd676509f24a34f64 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -60,7 +60,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        if ( err != noErr )
 #endif
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
 #if TARGET_CARBON && PM_USE_SESSION_APIS
@@ -81,7 +81,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PrError() ;
        if ( err != noErr )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;
@@ -93,7 +93,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PrError() ;
        if ( err )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;
@@ -117,7 +117,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
     if ( err != noErr || m_macPrintSessionPort == kPMNoReference )
   #endif
     {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS
@@ -139,7 +139,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err != noErr )
     {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS
@@ -150,8 +150,8 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
                m_ok = FALSE;
                return;
     }
-       m_maxX = rPaper.right - rPaper.left ;
-       m_maxY = rPaper.bottom - rPaper.top ;
+       m_maxX = wxCoord(rPaper.right - rPaper.left) ;
+       m_maxY = wxCoord(rPaper.bottom - rPaper.top);
 #else
        m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ;
        m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ;
@@ -178,7 +178,7 @@ wxPrinterDC::~wxPrinterDC(void)
                }
                else
                {
-                       message.Printf( "Print Error %d", err ) ;
+                       message.Printf( "Print Error %ld", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
                }
@@ -196,7 +196,7 @@ wxPrinterDC::~wxPrinterDC(void)
   #endif
        if ( err != noErr )
        {
-                       message.Printf( "Print Error %d", err ) ;
+                       message.Printf( "Print Error %ld", err ) ;
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
        }
@@ -252,7 +252,7 @@ void wxPrinterDC::StartPage(void)
        err = PrError() ;
        if ( err != noErr )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrClosePage( (TPPrPort) m_macPrintSessionPort ) ;
@@ -271,7 +271,7 @@ void wxPrinterDC::StartPage(void)
   #endif
        if ( err != noErr )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS
@@ -302,7 +302,7 @@ void wxPrinterDC::EndPage(void)
        err = PrError() ;
        if ( err != noErr )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;
@@ -318,7 +318,7 @@ void wxPrinterDC::EndPage(void)
   #endif
        if ( err != noErr )
        {
-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS