make sure we catch invalid control refs better

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

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 26f337298596636156abecb14293cb96eeaae042..8ae0ce8f37220c18fc13015bff0027aade67d720 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxMacPrinter framework
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -15,23 +15,23 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __BORLANDC__
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #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
 
 #endif
 

-#include "wx/math.h"

 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 

-#include "wx/dcprint.h"

 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
 
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
 


@@ -41,7 +41,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMacCarbonPrintData, wxPrintNativeDataBase)
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxMacPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxMacPrintPreview, wxPrintPreviewBase)
 

-bool wxMacCarbonPrintData::Ok() const 
+bool wxMacCarbonPrintData::Ok() const

 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }
 {
     return (m_macPageFormat != kPMNoPageFormat) && (m_macPrintSettings != kPMNoPrintSettings) && (m_macPrintSession != kPMNoReference);
 }


@@ -66,7 +66,7 @@ wxMacCarbonPrintData::~wxMacCarbonPrintData()
         (void)PMRelease(m_macPrintSettings);
         m_macPrintSettings = kPMNoPrintSettings;
     }
         (void)PMRelease(m_macPrintSettings);
         m_macPrintSettings = kPMNoPrintSettings;
     }

-    
+

     if ( m_macPrintSession != kPMNoReference )
     {
         (void)PMRelease(m_macPrintSession);
     if ( m_macPrintSession != kPMNoReference )
     {
         (void)PMRelease(m_macPrintSession);


@@ -74,7 +74,7 @@ wxMacCarbonPrintData::~wxMacCarbonPrintData()
     }
 }
 
     }
 }
 

-void wxMacCarbonPrintData::ValidateOrCreate() 
+void wxMacCarbonPrintData::ValidateOrCreate()

 {
     OSStatus err = noErr ;
     if ( m_macPrintSession == kPMNoReference )
 {
     OSStatus err = noErr ;
     if ( m_macPrintSession == kPMNoReference )


@@ -85,7 +85,7 @@ void wxMacCarbonPrintData::ValidateOrCreate()
     if ( m_macPageFormat == kPMNoPageFormat)
     {
         err = PMCreatePageFormat((PMPageFormat *) &m_macPageFormat);
     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.
         //  Note that PMPageFormat is not session-specific, but calling
         //  PMSessionDefaultPageFormat assigns values specific to the printer
         //  associated with the current printing session.


@@ -102,12 +102,12 @@ void wxMacCarbonPrintData::ValidateOrCreate()
             (PMPageFormat) m_macPageFormat,
             kPMDontWantBoolean);
     }
             (PMPageFormat) m_macPageFormat,
             kPMDontWantBoolean);
     }

-    
+

     //  Set up a valid PrintSettings object.
     if ( m_macPrintSettings == kPMNoPrintSettings)
     {
         err = PMCreatePrintSettings((PMPrintSettings *) &m_macPrintSettings);
     //  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.
         //  Note that PMPrintSettings is not session-specific, but calling
         //  PMSessionDefaultPrintSettings assigns values specific to the printer
         //  associated with the current printing session.


@@ -134,7 +134,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
         kPMLandscape : kPMPortrait , false ) ;
     // collate cannot be set
 #if 0 // not yet tested
         kPMLandscape : kPMPortrait , false ) ;
     // collate cannot be set
 #if 0 // not yet tested

-    if ( m_printerName.Length() > 0 )
+    if ( !m_printerName.empty() )

         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;


@@ -146,7 +146,7 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     }
     else
         PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;
     }
     else
         PMSetColorMode( (PMPrintSettings) m_macPrintSettings, kPMBlackAndWhite ) ;

-    
+

     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize
     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize


@@ -156,6 +156,11 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
     PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
     PMPrinterGetPrinterResolution(printer, tag, &res);
     PMSetResolution((PMPageFormat) m_macPageFormat, &res);
     PMSessionGetCurrentPrinter(m_macPrintSession, &printer);
     PMPrinterGetPrinterResolution(printer, tag, &res);
     PMSetResolution((PMPageFormat) m_macPageFormat, &res);

+    // 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 ;
 }
 
     return true ;
 }


@@ -163,12 +168,12 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
 bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
 {
     OSStatus err = noErr ;
 bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
 {
     OSStatus err = noErr ;

-    
+

     UInt32 copies ;
     err = PMGetCopies( m_macPrintSettings , &copies ) ;
     if ( err == noErr )
     UInt32 copies ;
     err = PMGetCopies( m_macPrintSettings , &copies ) ;
     if ( err == noErr )

-        data.SetNoCopies( copies ) ; 
-          
+        data.SetNoCopies( copies ) ;
+

     PMOrientation orientation ;
     err = PMGetOrientation(  m_macPageFormat , &orientation ) ;
     if ( err == noErr )
     PMOrientation orientation ;
     err = PMGetOrientation(  m_macPageFormat , &orientation ) ;
     if ( err == noErr )


@@ -189,16 +194,16 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
         m_printerName = name.AsString() ;
     }
 #endif
         m_printerName = name.AsString() ;
     }
 #endif

-    
+

     PMColorMode color ;
     err = PMGetColorMode( m_macPrintSettings, &color ) ;
     if ( err == noErr )
         data.SetColour( !(color == kPMBlackAndWhite) ) ;
     PMColorMode color ;
     err = PMGetColorMode( m_macPrintSettings, &color ) ;
     if ( err == noErr )
         data.SetColour( !(color == kPMBlackAndWhite) ) ;

-        
+

     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize
     // PMDuplexMode not yet accessible via API
     // PMQualityMode not yet accessible via API
     // todo paperSize

-       PMRect rPaper;
+    PMRect rPaper;

     err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
     err = PMGetUnadjustedPaperRect( m_macPageFormat, &rPaper);
     if ( err == noErr )
     {


@@ -218,7 +223,7 @@ void wxMacCarbonPrintData::TransferFrom( wxPageSetupData *data )
 
 void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
 {
 
 void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
 {

-       PMRect rPaper;
+    PMRect rPaper;

     OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
     OSStatus err = PMGetUnadjustedPaperRect(m_macPageFormat, &rPaper);
     if ( err == noErr )
     {


@@ -227,10 +232,10 @@ void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
         if ( err == noErr )
         {
             data->SetMinMarginTopLeft( wxPoint (
         if ( err == noErr )
         {
             data->SetMinMarginTopLeft( wxPoint (

-                   (int)(((double) rPage.left - rPaper.left ) * pt2mm) ,
-                   (int)(((double) rPage.top - rPaper.top ) * pt2mm) ) ) ;
-               
-               data->SetMinMarginBottomRight( 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)) ) ;
 
                 (wxCoord)(((double) rPaper.right - rPage.right ) * pt2mm),
                 (wxCoord)(((double) rPaper.bottom - rPage.bottom ) * pt2mm)) ) ;
 


@@ -248,9 +253,8 @@ void wxMacCarbonPrintData::TransferTo( wxPageSetupData* data )
             if ( data->GetMarginBottomRight().y < data->GetMinMarginBottomRight().y )
                 data->SetMarginBottomRight( wxPoint( data->GetMarginBottomRight().x ,
                     data->GetMinMarginBottomRight().y) );
             if ( data->GetMarginBottomRight().y < data->GetMinMarginBottomRight().y )
                 data->SetMarginBottomRight( wxPoint( data->GetMarginBottomRight().x ,
                     data->GetMinMarginBottomRight().y) );

-
-           }
-       }
+        }
+    }

 }
 
 void wxMacCarbonPrintData::TransferTo( wxPrintDialogData* data )
 }
 
 void wxMacCarbonPrintData::TransferTo( wxPrintDialogData* data )


@@ -287,13 +291,9 @@ void wxMacCarbonPrintData::TransferFrom( wxPrintDialogData* data )
     PMSetFirstPage( m_macPrintSettings , data->GetFromPage() , false ) ;
 
     if (data->GetAllPages() || data->GetFromPage() == 0)
     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 ) ;
-       }
+        PMSetLastPage( m_macPrintSettings , (UInt32) kPMPrintAllPages, true ) ;
+    else
+        PMSetLastPage( m_macPrintSettings , (UInt32) data->GetToPage() , false ) ;

 }
 
 /*
 }
 
 /*


@@ -311,19 +311,19 @@ wxMacPrinter::~wxMacPrinter(void)
 
 bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
 
 bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {

-    sm_abortIt = FALSE;
+    sm_abortIt = false;

     sm_abortWindow = NULL;
     sm_abortWindow = NULL;

-    
+

     if (!printout)
     if (!printout)

-        return FALSE;
-    
-    printout->SetIsPreview(FALSE);
+        return false;
+
+    printout->SetIsPreview(false);

     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
         m_printDialogData.SetMaxPage(9999);
 
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
         m_printDialogData.SetMaxPage(9999);
 

-    // Create a suitable device context  
+    // Create a suitable device context

     wxDC *dc = NULL;
     if (prompt)
     {
     wxDC *dc = NULL;
     if (prompt)
     {


@@ -338,73 +338,74 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     {
         dc = new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
     }
     {
         dc = new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
     }

-    
-    
+

     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {
     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {

-        if (dc) delete dc;
-        return FALSE;
+        if (dc)
+            delete dc;
+        return false;

     }
     }

-    
+

     // on the mac we have always pixels as addressing mode with 72 dpi
     // 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());
     PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
     printout->SetPPIScreen(72, 72);
     PMResolution res;
     wxMacCarbonPrintData* nativeData = (wxMacCarbonPrintData*)
           (m_printDialogData.GetPrintData().GetNativeData());
     PMGetResolution((PMPageFormat) (nativeData->m_macPageFormat), &res);
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));

-    
-    // Set printout parameters  
+
+    // Set printout parameters

     printout->SetDC(dc);
     printout->SetDC(dc);

-    
+

     int w, h;
     wxCoord ww, hh;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
     dc->GetSizeMM(&ww, &hh);
     printout->SetPageSizeMM((int)ww, (int)hh);
     int w, h;
     wxCoord 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();
     // Create an abort window
     wxBeginBusyCursor();

-    
+

     printout->OnPreparePrinting();
     printout->OnPreparePrinting();

-    
+

     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);

-    
+

     if (maxPage == 0)
     {
         wxEndBusyCursor();
     if (maxPage == 0)
     {
         wxEndBusyCursor();

-        return FALSE;
+        return false;

     }
     }

-    
+

     // Only set min and max, because from and to have been
     // set by the user
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
     // 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);
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxSafeYield(win,true);

-    
+

     if (!win)
     {
         wxEndBusyCursor();
         wxMessageBox(wxT("Sorry, could not create an abort dialog."), wxT("Print Error"), wxOK, parent);
         delete dc;
     if (!win)
     {
         wxEndBusyCursor();
         wxMessageBox(wxT("Sorry, could not create an abort dialog."), wxT("Print Error"), wxOK, parent);
         delete dc;

-        return FALSE;
+
+        return false;

     }
     }

+

     sm_abortWindow = win;
     sm_abortWindow = win;

-    sm_abortWindow->Show(TRUE);
+    sm_abortWindow->Show(true);

     wxSafeYield(win,true);
     wxSafeYield(win,true);

-    
+

     printout->OnBeginPrinting();
     printout->OnBeginPrinting();

-    
-    bool keepGoing = TRUE;
-    
+
+    bool keepGoing = true;
+

     int copyCount;
     for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
     {
     int copyCount;
     for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
     {


@@ -416,14 +417,15 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
         }
         if (sm_abortIt)
             break;
         }
         if (sm_abortIt)
             break;

-        
+

         int pn;
         int pn;

-        for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
+        for (pn = m_printDialogData.GetFromPage();
+        keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);

         pn++)
         {
             if (sm_abortIt)
             {
         pn++)
         {
             if (sm_abortIt)
             {

-                keepGoing = FALSE;
+                keepGoing = false;

                 break;
             }
             else
                 break;
             }
             else


@@ -444,36 +446,36 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
         }
         printout->OnEndDocument();
     }
         }
         printout->OnEndDocument();
     }

-    
+

     printout->OnEndPrinting();
     printout->OnEndPrinting();

-    
+

     if (sm_abortWindow)
     {
     if (sm_abortWindow)
     {

-        sm_abortWindow->Show(FALSE);
+        sm_abortWindow->Show(false);

         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }
         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }

-    
+

     wxEndBusyCursor();
     wxEndBusyCursor();

-    
+

     delete dc;
     delete dc;

-    
-    return TRUE;
+
+    return true;

 }
 
 wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
 {
     wxDC* dc = (wxDC*) NULL;
 }
 
 wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
 {
     wxDC* dc = (wxDC*) NULL;

-    
+

     wxPrintDialog dialog(parent, & m_printDialogData);
     int ret = dialog.ShowModal();
     wxPrintDialog dialog(parent, & m_printDialogData);
     int ret = dialog.ShowModal();

-    
+

     if (ret == wxID_OK)
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();
     }
     if (ret == wxID_OK)
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();
     }

-    
+

     return dc;
 }
 
     return dc;
 }
 


@@ -481,17 +483,16 @@ bool wxMacPrinter::Setup(wxWindow *parent)
 {
 #if 0
     wxPrintDialog dialog(parent, & m_printDialogData);
 {
 #if 0
     wxPrintDialog dialog(parent, & m_printDialogData);

-    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    
+    dialog.GetPrintDialogData().SetSetupDialog(true);
+

     int ret = dialog.ShowModal();
     int ret = dialog.ShowModal();

-    
+

     if (ret == wxID_OK)
     if (ret == wxID_OK)

-    {

         m_printDialogData = dialog.GetPrintDialogData();
         m_printDialogData = dialog.GetPrintDialogData();

-    }
-    
+

     return (ret == wxID_OK);
 #endif
     return (ret == wxID_OK);
 #endif

+

     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }
 


@@ -520,7 +521,8 @@ wxMacPrintPreview::~wxMacPrintPreview(void)
 bool wxMacPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
 bool wxMacPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)

-        return FALSE;
+        return false;
+

     wxMacPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
     wxMacPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }


@@ -529,38 +531,40 @@ void wxMacPrintPreview::DetermineScaling(void)
 {
     int screenWidth , screenHeight ;
     wxDisplaySize( &screenWidth , &screenHeight ) ;
 {
     int screenWidth , screenHeight ;
     wxDisplaySize( &screenWidth , &screenHeight ) ;

+
+    wxSize ppiScreen( 72 , 72 ) ;
+    wxSize ppiPrinter( 72 , 72 ) ;

     
     

-    m_previewPrintout->SetPPIScreen( 72 , 72 ) ;
-    m_previewPrintout->SetPPIPrinter( 72 , 72 ) ;
-    m_previewPrintout->SetPageSizeMM( (int) (8.0 * 25.6), (int) (11.0 * 25.6) );
-    m_previewPrintout->SetPageSizePixels( 8 * 72 , 11 * 72 ) ;
-    m_pageWidth = 8 * 72 ;
-    m_pageHeight = 11 * 72 ;
-    m_previewScale = 1 ;
+    m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;

     
     

+    int x , y ;
+    wxCoord ww, hh;
+

     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
     if (printerDC.Ok())
     {
     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
     if (printerDC.Ok())
     {

-        int x , y ;
-        wxCoord ww, hh;

         printerDC.GetSizeMM(&ww, &hh);
         printerDC.GetSize( &x , &y ) ;
         printerDC.GetSizeMM(&ww, &hh);
         printerDC.GetSize( &x , &y ) ;

-        m_previewPrintout->SetPageSizeMM((int)ww, (int)hh);
-        m_previewPrintout->SetPageSizePixels( x , y) ;
-        m_pageWidth = x ;
-        m_pageHeight =  y ;
+        ppiPrinter = printerDC.GetPPI() ;

         m_isOk = true ;
     }
     else
     {
         m_isOk = true ;
     }
     else
     {

+        // use some defaults
+        x = 8 * 72 ;
+        y = 11 * 72 ;
+        ww = (int) (x * 25.4 / ppiPrinter.x) ;
+        hh = (int) (y * 25.4 / ppiPrinter.y) ;

         m_isOk = false ;
     }
         m_isOk = false ;
     }

-    // 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)printerXRes);
-    
-    m_previewScale = 1 ; 
+    m_previewPrintout->SetPageSizeMM((int)ww, (int)hh);
+    m_previewPrintout->SetPageSizePixels( x , y) ;
+    m_pageWidth = x ;
+    m_pageHeight = y ;
+    m_previewPrintout->SetPPIPrinter( ppiPrinter.x , ppiPrinter.y ) ;
+
+    m_previewScale = (float)((float)ppiScreen.x/(float)ppiPrinter.y);

 }
 
 #endif
 }
 
 #endif