corrected warnings

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

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index f772e44dcd4a7368c65577ecfe992ef75cd8b323..6c32de8ad07f773c2225d7efd676509f24a34f64 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -27,6 +27,16 @@
 #include "wx/msgdlg.h"
 #include <math.h>
 #include "wx/mac/uma.h"
+#ifndef __DARWIN__
+#include "Printing.h"
+#endif
+
+#if defined(TARGET_CARBON) && !defined(__DARWIN__)
+#  if PM_USE_SESSION_APIS
+#    include <PMCore.h>
+#  endif
+#  include <PMApplication.h>
+#endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
@@ -43,20 +53,20 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        m_printData.ConvertToNative() ;
 
 #if TARGET_CARBON && PM_USE_SESSION_APIS
-       err = UMAPrOpen((PMPrintSession *)&m_macPrintSessionPort) ;
+       err = UMAPrOpen(&m_macPrintSessionPort) ;
        if ( err != noErr || m_macPrintSessionPort == kPMNoData )
 #else
-       err = UMAPrOpen() ;
+       err = UMAPrOpen(NULL) ;
        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
-               UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+               UMAPrClose(&m_macPrintSessionPort) ;
 #else
-               UMAPrClose() ;
+               UMAPrClose(NULL) ;
 #endif
                m_ok = FALSE;
                return;
@@ -71,10 +81,10 @@ 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() ;
+               UMAPrClose(NULL) ;
                m_ok = FALSE;
                return;
        }
@@ -83,10 +93,10 @@ 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() ;
+               UMAPrClose(NULL) ;
                m_ok = FALSE;
                return;
        }
@@ -107,13 +117,13 @@ 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
-               UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+               UMAPrClose(&m_macPrintSessionPort) ;
   #else
-               UMAPrClose() ;
+               UMAPrClose(NULL) ;
   #endif
                m_ok = FALSE;
                return;
@@ -129,19 +139,19 @@ 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
-               UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+               UMAPrClose(&m_macPrintSessionPort) ;
   #else
-               UMAPrClose() ;
+               UMAPrClose(NULL) ;
   #endif
                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 ;
@@ -168,11 +178,11 @@ 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();
                }
-               ::UMAPrClose() ;
+               ::UMAPrClose(NULL) ;
 //       ::SetPort( macPrintFormerPort ) ;
                ::SetPort( LMGetWMgrPort() ) ;
        }
@@ -186,14 +196,14 @@ 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();
        }
   #if TARGET_CARBON && PM_USE_SESSION_APIS
-           UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+           UMAPrClose(&m_macPrintSessionPort) ;
   #else
-           UMAPrClose() ;
+           UMAPrClose(NULL) ;
   #endif
        }
 #endif
@@ -242,12 +252,12 @@ 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 ) ;
                ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort ) ;
-               ::UMAPrClose() ;
+               ::UMAPrClose(NULL) ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
@@ -261,17 +271,17 @@ 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
                PMSessionEndPage((PMPrintSession)m_macPrintSessionPort);
                PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
-               UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+               UMAPrClose(&m_macPrintSessionPort) ;
   #else
                PMEndPage(m_macPrintSessionPort);
                PMEndDocument(m_macPrintSessionPort);
-               UMAPrClose() ;
+               UMAPrClose(NULL) ;
   #endif
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
@@ -292,11 +302,11 @@ 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  ) ;
-               ::UMAPrClose() ;
+               ::UMAPrClose(NULL) ;
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;
        }
@@ -308,15 +318,15 @@ 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
                PMSessionEndDocument((PMPrintSession)m_macPrintSessionPort);
-               UMAPrClose((PMPrintSession *)&m_macPrintSessionPort) ;
+               UMAPrClose(&m_macPrintSessionPort) ;
   #else
                PMEndDocument(m_macPrintSessionPort);
-               UMAPrClose() ;
+               UMAPrClose(NULL) ;
   #endif
                ::SetPort( macPrintFormerPort ) ;
                m_ok = FALSE ;