X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72e7876ba5ad16a1b03bb2449ea7886ec648854a..b3c1d21c7f6a88bd82cee5d3a64fa1bfecd50ed4:/src/mac/carbon/printmac.cpp?ds=sidebyside

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 4b84cc1a1e..7d35f7a8e5 100644
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -1,51 +1,369 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printwin.cpp
+// Name:        src/mac/carbon/printwin.cpp
 // Purpose:     wxMacPrinter framework
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "printwin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/dcprint.h"
+    #include "wx/math.h"
 #endif
 
+#include "wx/mac/uma.h"
+
 #include "wx/mac/printmac.h"
-#include "wx/dcprint.h"
+#include "wx/mac/private/print.h"
+
 #include "wx/printdlg.h"
+#include "wx/paper.h"
+#include "wx/mac/printdlg.h"
 
 #include <stdlib.h>
 
-#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
+
+bool wxMacCarbonPrintData::IsOk() const
+{
+    return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
+}
+wxMacCarbonPrintData::wxMacCarbonPrintData()
+{
+    m_macPageFormat = kPMNoPageFormat;
+    m_macPrintSettings = kPMNoPrintSettings;
+    m_macPrintSession = kPMNoReference ;
+    ValidateOrCreate() ;
+}
+
+wxMacCarbonPrintData::~wxMacCarbonPrintData()
+{
+    if (m_macPageFormat != kPMNoPageFormat)
+    {
+        (void)PMRelease(m_macPageFormat);
+        m_macPageFormat = kPMNoPageFormat;
+    }
+
+    if (m_macPrintSettings != kPMNoPrintSettings)
+    {
+        (void)PMRelease(m_macPrintSettings);
+        m_macPrintSettings = kPMNoPrintSettings;
+    }
+
+    if ( m_macPrintSession != kPMNoReference )
+    {
+        (void)PMRelease(m_macPrintSession);
+        m_macPrintSession = kPMNoReference;
+    }
+}
+
+void wxMacCarbonPrintData::ValidateOrCreate()
+{
+    OSStatus err = noErr ;
+    if ( m_macPrintSession == kPMNoReference )
+    {
+        err = PMCreateSession( (PMPrintSession *) &m_macPrintSession ) ;
+    }
+    //  Set up a valid PageFormat object.
+    if ( m_macPageFormat == kPMNoPageFormat)
+    {
+        err = PMCreatePageFormat((PMPageFormat *) &m_macPageFormat);
+
+        //  Note that PMPageFormat is not session-specific, but calling
+        //  PMSessionDefaultPageFormat assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) &&
+            ( m_macPageFormat != kPMNoPageFormat))
+        {
+            err = PMSessionDefaultPageFormat((PMPrintSession) m_macPrintSession,
+                (PMPageFormat) m_macPageFormat);
+        }
+    }
+    else
+    {
+        err = PMSessionValidatePageFormat((PMPrintSession) m_macPrintSession,
+            (PMPageFormat) m_macPageFormat,
+            kPMDontWantBoolean);
+    }
+
+    //  Set up a valid PrintSettings object.
+    if ( m_macPrintSettings == kPMNoPrintSettings)
+    {
+        err = PMCreatePrintSettings((PMPrintSettings *) &m_macPrintSettings);
+
+        //  Note that PMPrintSettings is not session-specific, but calling
+        //  PMSessionDefaultPrintSettings assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) &&
+            ( m_macPrintSettings != kPMNoPrintSettings))
+        {
+            err = PMSessionDefaultPrintSettings((PMPrintSession) m_macPrintSession,
+                (PMPrintSettings) m_macPrintSettings);
+        }
+    }
+    else
+    {
+        err = PMSessionValidatePrintSettings((PMPrintSession) m_macPrintSession,
+            (PMPrintSettings) m_macPrintSettings,
+            kPMDontWantBoolean);
+    }
+}
+
+bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
+{
+    ValidateOrCreate() ;
+    PMSetCopies( (PMPrintSettings) m_macPrintSettings , data.GetNoCopies() , false ) ;
+    if ( data.IsOrientationReversed() )
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMReverseLandscape : kPMReversePortrait , false ) ;
+    else
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMLandscape : kPMPortrait , false ) ;
+    // collate cannot be set
+#if 0 // not yet tested
+    if ( !m_printerName.empty() )
+        PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
+#endif
+#ifndef __LP64__
+    PMColorMode color ;
+    PMGetColorMode(  (PMPrintSettings) m_macPrintSettings, &color ) ;
+    if ( data.GetColour() )
+    {
+        if ( color == kPMBlackAndWhite )
+            PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMColor ) ;
+    }
+    else
+        PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
 #endif
 
+    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 ) ;
+
+    // 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 
+    PMPrinterGetOutputResolution( printer,  
+        (PMPrintSettings) m_macPrintSettings,  &res) ;
+    // TODO transfer ? into page format ?
+#else
+    PMTag tag = kPMMaxSquareResolution;
+    PMPrinterGetPrinterResolution(printer, tag, &res);
+    PMSetResolution((PMPageFormat) m_macPageFormat, &res);
+#endif
+    // after setting the new resolution the format has to be updated, otherwise the page rect remains 
+    // at the 'old' scaling
+    PMSessionValidatePageFormat((PMPrintSession) m_macPrintSession,
+            (PMPageFormat) m_macPageFormat,
+            kPMDontWantBoolean) ;
+
+    return true ;
+}
+
+bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
+{
+    OSStatus err = noErr ;
+
+    UInt32 copies ;
+    err = PMGetCopies( m_macPrintSettings , &copies ) ;
+    if ( err == noErr )
+        data.SetNoCopies( copies ) ;
+
+    PMOrientation orientation ;
+    err = PMGetOrientation(  m_macPageFormat , &orientation ) ;
+    if ( err == noErr )
+    {
+        if ( orientation == kPMPortrait || orientation == kPMReversePortrait )
+        {
+            data.SetOrientation( wxPORTRAIT  );
+            data.SetOrientationReversed( orientation == kPMReversePortrait );
+        }
+        else
+        {
+            data.SetOrientation( wxLANDSCAPE );
+            data.SetOrientationReversed( orientation == kPMReverseLandscape );
+        }
+    }
+
+    // collate cannot be set
+#if 0
+    {
+        wxMacCFStringHolder name ;
+        PMPrinter printer ;
+        PMSessionGetCurrentPrinter( m_macPrintSession ,
+            &printer ) ;
+        m_printerName = name.AsString() ;
+    }
+#endif
+
+#ifndef __LP64__
+    PMColorMode color ;
+    err = PMGetColorMode( m_macPrintSettings, &color ) ;
+    if ( err == noErr )
+        data.SetColour( !(color == kPMBlackAndWhite) ) ;
+#endif
+    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 ;
+    }
+    // PMQualityMode not yet accessible via API
+    
+    PMPaper paper ;
+    PMGetPageFormatPaper( m_macPageFormat, &paper );
+    
+    PMRect rPaper;
+    err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
+    if ( err == noErr )
+    {
+        wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
+             (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ));
+        data.SetPaperSize(sz);
+        wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
+        if (id != wxPAPER_NONE)
+        {
+            data.SetPaperId(id);
+        }
+    }
+    return true ;
+}
+
+void wxMacCarbonPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) )
+{
+    // should we setup the page rect here ?
+    // since MacOS sometimes has two same paper rects with different
+    // page rects we could make it roundtrip safe perhaps
+}
+
+void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
+{
+    PMRect rPaper;
+    OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
+    if ( err == noErr )
+    {
+        wxSize sz((int)(( rPaper.right - rPaper.left ) * pt2mm + 0.5 ) ,
+             (int)(( rPaper.bottom - rPaper.top ) * pt2mm + 0.5 ));
+        data->SetPaperSize(sz);
+
+        PMRect rPage ;
+        err = PMGetUnadjustedPageRect(m_macPageFormat , &rPage ) ;
+        if ( err == noErr )
+        {
+            data->SetMinMarginTopLeft( wxPoint (
+                (int)(((double) rPage.left - rPaper.left ) * pt2mm) ,
+                (int)(((double) rPage.top - rPaper.top ) * pt2mm) ) ) ;
+
+            data->SetMinMarginBottomRight( wxPoint (
+                (wxCoord)(((double) rPaper.right - rPage.right ) * pt2mm),
+                (wxCoord)(((double) rPaper.bottom - rPage.bottom ) * pt2mm)) ) ;
+
+            if ( data->GetMarginTopLeft().x < data->GetMinMarginTopLeft().x )
+                data->SetMarginTopLeft( wxPoint( data->GetMinMarginTopLeft().x ,
+                    data->GetMarginTopLeft().y ) ) ;
+
+            if ( data->GetMarginBottomRight().x < data->GetMinMarginBottomRight().x )
+                data->SetMarginBottomRight( wxPoint( data->GetMinMarginBottomRight().x ,
+                    data->GetMarginBottomRight().y ) );
+
+            if ( data->GetMarginTopLeft().y < data->GetMinMarginTopLeft().y )
+                data->SetMarginTopLeft( wxPoint( data->GetMarginTopLeft().x , data->GetMinMarginTopLeft().y ) );
+
+            if ( data->GetMarginBottomRight().y < data->GetMinMarginBottomRight().y )
+                data->SetMarginBottomRight( wxPoint( data->GetMarginBottomRight().x ,
+                    data->GetMinMarginBottomRight().y) );
+        }
+    }
+}
+
+void wxMacCarbonPrintData::TransferTo( wxPrintDialogData* data )
+{
+    UInt32 minPage , maxPage ;
+    PMGetPageRange( m_macPrintSettings , &minPage , &maxPage ) ;
+    data->SetMinPage( minPage ) ;
+    data->SetMaxPage( maxPage ) ;
+    UInt32 copies ;
+    PMGetCopies( m_macPrintSettings , &copies ) ;
+    data->SetNoCopies( copies ) ;
+    UInt32 from , to ;
+    PMGetFirstPage( m_macPrintSettings , &from ) ;
+    PMGetLastPage( m_macPrintSettings , &to ) ;
+    if ( to >= 0x7FFFFFFF ) //  due to an OS Bug we don't get back kPMPrintAllPages
+    {
+        data->SetAllPages( true ) ;
+        // This means all pages, more or less
+        data->SetFromPage(1);
+        data->SetToPage(32000);
+    }
+    else
+    {
+        data->SetFromPage( from ) ;
+        data->SetToPage( to ) ;
+        data->SetAllPages( false );
+    }
+}
+
+void wxMacCarbonPrintData::TransferFrom( wxPrintDialogData* data )
+{
+    PMSetPageRange( m_macPrintSettings , data->GetMinPage() , data->GetMaxPage() ) ;
+    PMSetCopies( m_macPrintSettings , data->GetNoCopies() , false ) ;
+    PMSetFirstPage( m_macPrintSettings , data->GetFromPage() , false ) ;
+
+    if (data->GetAllPages() || data->GetFromPage() == 0)
+        PMSetLastPage( m_macPrintSettings , (UInt32) kPMPrintAllPages, true ) ;
+    else
+        PMSetLastPage( m_macPrintSettings , (UInt32) data->GetToPage() , false ) ;
+}
+
 /*
- * Printer
- */
- 
+* Printer
+*/
+
 wxMacPrinter::wxMacPrinter(wxPrintDialogData *data):
-  wxPrinterBase(data)
+wxPrinterBase(data)
 {
 }
 
@@ -55,166 +373,156 @@ wxMacPrinter::~wxMacPrinter(void)
 
 bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
-  sm_abortIt = FALSE;
-  sm_abortWindow = NULL;
+    sm_abortIt = false;
+    sm_abortWindow = NULL;
 
-  if (!printout)
-    return FALSE;
-    
-  printout->SetIsPreview(FALSE);
-  printout->OnPreparePrinting();
-
-  // Get some parameters from the printout, if defined
-  int fromPage, toPage;
-  int minPage, maxPage;
-  printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-  if (maxPage == 0)
-    return FALSE;
-
-  m_printDialogData.SetMinPage(minPage);
-  m_printDialogData.SetMaxPage(maxPage);
-  if (fromPage != 0)
-    m_printDialogData.SetFromPage(fromPage);
-  if (toPage != 0)
-    m_printDialogData.SetToPage(toPage);
-
-  if (minPage != 0)
-  {
-    m_printDialogData.EnablePageNumbers(TRUE);
-    if (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage())
-      m_printDialogData.SetFromPage(m_printDialogData.GetMinPage());
-    else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage())
-      m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage());
-    if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage())
-      m_printDialogData.SetToPage(m_printDialogData.GetMaxPage());
-    else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage())
-      m_printDialogData.SetToPage(m_printDialogData.GetMinPage());
-  }
-  else
-    m_printDialogData.EnablePageNumbers(FALSE);
-
-  // Create a suitable device context  
- // Create a suitable device context  
-  wxDC *dc = NULL;
-  if (prompt)
-  {
- 		PrOpen() ;
-  		m_printDialogData.ConvertToNative() ; // make sure we have a valid handle
-  		if ( m_printDialogData.m_macPrintInfo )
-  		{
-   			// todo incorporate the changes from a global page setup
- 			if  ( ::PrStlDialog( m_printDialogData.m_macPrintInfo ) ) // we should have the page setup dialog
- 			{
- 				PrClose() ;
-		        wxPrintDialog dialog(parent, & m_printDialogData);
-		        if (dialog.ShowModal() == wxID_OK)
-		        {
-		          dc = dialog.GetPrintDC();
-		          m_printDialogData = dialog.GetPrintData();
-		        }
- 			}
- 			else
- 			{
-  				PrClose() ;
-  			}
-  		}
-  }
-  else
-  {
-  		dc = new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
-  }
-
-
-  // May have pressed cancel.
-  if (!dc || !dc->Ok())
-  {
-    if (dc) delete dc;
-    return FALSE;
-  }
-  
-	// on the mac we have always pixels as addressing mode with 72 dpi
-
-  printout->SetPPIScreen(72, 72);
-  printout->SetPPIPrinter(72, 72);
-
-  // Set printout parameters  
-  printout->SetDC(dc);
-
-  int w, h;
-  long ww, hh;
-  dc->GetSize(&w, &h);
-  printout->SetPageSizePixels((int)w, (int)h);
-  dc->GetSizeMM(&ww, &hh);
-  printout->SetPageSizeMM((int)ww, (int)hh);
-
-  // Create an abort window
-  wxBeginBusyCursor();
+    if (!printout)
+        return false;
 
-/*
-  wxWindow *win = CreateAbortWindow(parent, printout);
-  wxYield();
+    printout->SetIsPreview(false);
+    if (m_printDialogData.GetMinPage() < 1)
+        m_printDialogData.SetMinPage(1);
+    if (m_printDialogData.GetMaxPage() < 1)
+        m_printDialogData.SetMaxPage(9999);
 
-  if (!win)
-  {
-    wxEndBusyCursor();
-    wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
-    delete dc;
-  }
-  sm_abortWindow = win;
-  sm_abortWindow->Show(TRUE);
-  wxYield();
-*/
+    // Create a suitable device context
+    wxPrinterDC *dc = NULL;
+    if (prompt)
+    {
+        wxMacPrintDialog dialog(parent, & m_printDialogData);
+        if (dialog.ShowModal() == wxID_OK)
+        {
+            dc = wxDynamicCast(dialog.GetPrintDC(), wxPrinterDC);
+            wxASSERT(dc);
+            m_printDialogData = dialog.GetPrintDialogData();
+        }
+    }
+    else
+    {
+        dc = new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
+    }
+
+    // May have pressed cancel.
+    if (!dc || !dc->Ok())
+    {
+        if (dc)
+            delete dc;
+        return false;
+    }
+
+    // on the mac we have always pixels as addressing mode with 72 dpi
+    printout->SetPPIScreen(72, 72);
+    PMResolution res;
+    wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
+          (m_printDialogData.GetPrintData().GetNativeData());
+#if 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) ;
+#else
+    PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);
+#endif
+    printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
+
+    // Set printout parameters
+    printout->SetDC(dc);
+
+    int w, h;
+    dc->GetSize(&w, &h);
+    printout->SetPageSizePixels((int)w, (int)h);
+    printout->SetPaperRectPixels(dc->GetPaperRect());
+    wxCoord mw, mh;
+    dc->GetSizeMM(&mw, &mh);
+    printout->SetPageSizeMM((int)mw, (int)mh);
 
-  printout->OnBeginPrinting();
-  
-  bool keepGoing = TRUE;
+    // Create an abort window
+    wxBeginBusyCursor();
 
-  int copyCount;
-  for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
-  {
-    if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+    printout->OnPreparePrinting();
+
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
+
+    if (maxPage == 0)
     {
-      wxEndBusyCursor();
-      wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
-      break;
+        wxEndBusyCursor();
+        return false;
     }
-    if (sm_abortIt)
-      break;
 
-    int pn;
-    for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
-         pn++)
+    // Only set min and max, because from and to have been
+    // set by the user
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);
+
+    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxSafeYield(win,true);
+
+    if (!win)
     {
-      if (sm_abortIt)
-      {
-        keepGoing = FALSE;
-        break;
-      }
-      else
-      {
-        dc->StartPage();
-        keepGoing = printout->OnPrintPage(pn);
-        dc->EndPage();
-      }
+        wxEndBusyCursor();
+        wxMessageBox(wxT("Sorry, could not create an abort dialog."), wxT("Print Error"), wxOK, parent);
+        delete dc;
+
+        return false;
     }
-    printout->OnEndDocument();
-  }
 
-  printout->OnEndPrinting();
+    sm_abortWindow = win;
+    sm_abortWindow->Show(true);
+    wxSafeYield(win,true);
 
-  if (sm_abortWindow)
-  {
-    sm_abortWindow->Show(FALSE);
-    delete sm_abortWindow;
-    sm_abortWindow = NULL;
-  }
+    printout->OnBeginPrinting();
+
+    bool keepGoing = true;
+
+    int copyCount;
+    for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
+    {
+        if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+        {
+            wxEndBusyCursor();
+            wxMessageBox(wxT("Could not start printing."), wxT("Print Error"), wxOK, parent);
+            break;
+        }
+        if (sm_abortIt)
+            break;
+
+        int pn;
+        for (pn = m_printDialogData.GetFromPage();
+        keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
+        pn++)
+        {
+            if (sm_abortIt)
+            {
+                keepGoing = false;
+                break;
+            }
+            else
+            {
+                wxSafeYield(win,true);
+                dc->StartPage();
+                keepGoing = printout->OnPrintPage(pn);
+                dc->EndPage();
+            }
+        }
+        printout->OnEndDocument();
+    }
 
-  wxEndBusyCursor();
+    printout->OnEndPrinting();
 
-  delete dc;
-  
-  return TRUE;
+    if (sm_abortWindow)
+    {
+        sm_abortWindow->Show(false);
+        delete sm_abortWindow;
+        sm_abortWindow = NULL;
+    }
+
+    wxEndBusyCursor();
+
+    delete dc;
+
+    return true;
 }
 
 wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
@@ -233,37 +541,39 @@ wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
     return dc;
 }
 
-bool wxMacPrinter::Setup(wxWindow *parent)
+bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent))
 {
+#if 0
     wxPrintDialog dialog(parent, & m_printDialogData);
-    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+    dialog.GetPrintDialogData().SetSetupDialog(true);
 
     int ret = dialog.ShowModal();
 
     if (ret == wxID_OK)
-    {
         m_printDialogData = dialog.GetPrintDialogData();
-    }
 
     return (ret == wxID_OK);
+#endif
+
+    return wxID_CANCEL;
 }
 
 /*
- * Print preview
- */
+* Print preview
+*/
 
 wxMacPrintPreview::wxMacPrintPreview(wxPrintout *printout,
-                                             wxPrintout *printoutForPrinting,
-                                             wxPrintDialogData *data)
-                     : wxPrintPreviewBase(printout, printoutForPrinting, data)
+                                     wxPrintout *printoutForPrinting,
+                                     wxPrintDialogData *data)
+                                     : wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 
 wxMacPrintPreview::wxMacPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
-  wxPrintPreviewBase(printout, printoutForPrinting, data)
+wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
-  DetermineScaling();
+    DetermineScaling();
 }
 
 wxMacPrintPreview::~wxMacPrintPreview(void)
@@ -272,58 +582,58 @@ wxMacPrintPreview::~wxMacPrintPreview(void)
 
 bool wxMacPrintPreview::Print(bool interactive)
 {
-  if (!m_printPrintout)
-    return FALSE;
-  wxMacPrinter printer(&m_printDialogData);
-  return printer.Print(m_previewFrame, m_printPrintout, interactive);
+    if (!m_printPrintout)
+        return false;
+
+    wxMacPrinter printer(&m_printDialogData);
+    return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
 
 void wxMacPrintPreview::DetermineScaling(void)
 {
-/*
-    HDC dc = ::GetDC(NULL);
-    int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
-//    int screenHeight = ::GetDeviceCaps(dc, VERTSIZE);
-    int screenXRes = ::GetDeviceCaps(dc, HORZRES);
-//    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
-    int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
-    int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
-    m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
+    int screenWidth , screenHeight ;
+    wxDisplaySize( &screenWidth , &screenHeight ) ;
 
-    ::ReleaseDC(NULL, dc);
+    wxSize ppiScreen( 72 , 72 ) ;
+    wxSize ppiPrinter( 72 , 72 ) ;
+    
+    // Note that with Leopard, screen dpi=72 is no longer a given
+    m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;
+    
+    wxCoord w , h ;
+    wxCoord ww, hh;
+    wxRect paperRect;
 
     // Get a device context for the currently selected printer
-    wxPrinterDC printerDC("", "", "", FALSE, m_printDialogData.GetOrientation());
-
-    int printerWidth = 150;
-    int printerHeight = 250;
-    int printerXRes = 1500;
-    int printerYRes = 2500;
-
-    if (printerDC.GetHDC())
+    wxPrinterDC printerDC(m_printDialogData.GetPrintData());
+    if (printerDC.Ok())
     {
-      printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
-      printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
-      printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
-      printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
-
-      int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
-      int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
-
-      m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-      m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
-      
-      if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
-        m_isOk = FALSE;
+        printerDC.GetSizeMM(&ww, &hh);
+        printerDC.GetSize( &w , &h ) ;
+        ppiPrinter = printerDC.GetPPI() ;
+        paperRect = printerDC.GetPaperRect();
+        m_isOk = true ;
     }
     else
-      m_isOk = FALSE;
-
-    m_pageWidth = printerXRes;
-    m_pageHeight = printerYRes;
+    {
+        // use some defaults
+        w = 8 * 72 ;
+        h = 11 * 72 ;
+        ww = (wxCoord) (w * 25.4 / ppiPrinter.x) ;
+        hh = (wxCoord) (h * 25.4 / ppiPrinter.y) ;
+        paperRect = wxRect(0, 0, w, h);
+        m_isOk = false ;
+    }
+    m_pageWidth = w;
+    m_pageHeight = h;
+    
+    m_previewPrintout->SetPageSizePixels(w , h) ;
+    m_previewPrintout->SetPageSizeMM(ww, hh);
+    m_previewPrintout->SetPaperRectPixels(paperRect);
+    m_previewPrintout->SetPPIPrinter( ppiPrinter.x , ppiPrinter.y ) ;
 
-    // At 100%, the page should look about page-size on the screen.
-    m_previewScale = (float)((float)screenWidth/(float)printerWidth);
-    m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);
-*/
+    m_previewScaleX = float(ppiScreen.x) / ppiPrinter.x;
+    m_previewScaleY = float(ppiScreen.y) / ppiPrinter.y;
 }
+
+#endif