crash upon hide fix

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

diff --git a/src/mac/printmac.cpp b/src/mac/printmac.cpp
index 4b84cc1a1ef5561ff5eb8cd29c35297bec7016cd..60d15137cff0c1269f91d9f91133a0d9174d1b0f 100644 (file)
--- a/src/mac/printmac.cpp
+++ b/src/mac/printmac.cpp
@@ -29,6 +29,8 @@
 #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msgdlg.h"
 #endif
 

+#include "wx/mac/private.h"
+

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


@@ -94,31 +96,16 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   else
     m_printDialogData.EnablePageNumbers(FALSE);
 
   else
     m_printDialogData.EnablePageNumbers(FALSE);
 

-  // Create a suitable device context  

  // Create a suitable device context  
   wxDC *dc = NULL;
   if (prompt)
   {
  // 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() ;
-                       }
-               }
+        wxPrintDialog dialog(parent, & m_printDialogData);
+        if (dialog.ShowModal() == wxID_OK)
+               {
+                    dc = dialog.GetPrintDC();
+                    m_printDialogData = dialog.GetPrintData();
+               }

   }
   else
   {
   }
   else
   {


@@ -142,7 +129,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   printout->SetDC(dc);
 
   int w, h;
   printout->SetDC(dc);
 
   int w, h;

-  long ww, hh;
+  wxCoord ww, hh;

   dc->GetSize(&w, &h);
   printout->SetPageSizePixels((int)w, (int)h);
   dc->GetSizeMM(&ww, &hh);
   dc->GetSize(&w, &h);
   printout->SetPageSizePixels((int)w, (int)h);
   dc->GetSizeMM(&ww, &hh);


@@ -151,20 +138,19 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
   // Create an abort window
   wxBeginBusyCursor();
 
   // Create an abort window
   wxBeginBusyCursor();
 

-/*

   wxWindow *win = CreateAbortWindow(parent, printout);
   wxWindow *win = CreateAbortWindow(parent, printout);

-  wxYield();
+  wxSafeYield(win,true);

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

+    return FALSE;

   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);
   }
   sm_abortWindow = win;
   sm_abortWindow->Show(TRUE);

-  wxYield();
-*/
+  wxSafeYield(win,true);

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


@@ -193,6 +179,11 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
       }
       else
       {
       }
       else
       {

+               GrafPtr thePort ;
+               GetPort( &thePort ) ;
+               wxSafeYield(win,true);
+        SetPort( thePort ) ;
+

         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);
         dc->EndPage();
         dc->StartPage();
         keepGoing = printout->OnPrintPage(pn);
         dc->EndPage();


@@ -280,50 +271,38 @@ bool wxMacPrintPreview::Print(bool interactive)
 
 void wxMacPrintPreview::DetermineScaling(void)
 {
 
 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);
-
-    ::ReleaseDC(NULL, dc);
+       int screenWidth , screenHeight ;
+       wxDisplaySize( &screenWidth , &screenHeight ) ;
+       
+       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 ;

 
     // Get a device context for the currently selected printer
 
     // 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;
-    }
-    else
-      m_isOk = FALSE;
-
-    m_pageWidth = printerXRes;
-    m_pageHeight = printerYRes;
-
+               int x , y ;
+               wxCoord ww, hh;
+               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 ;
+               m_isOk = true ;
+       }
+       else
+       {
+         m_isOk = false ;
+       }

     // At 100%, the page should look about page-size on the screen.
     // 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_previewScale = (float)((float)screenWidth/(float)printerWidth);
+    // m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerXRes);
+    
+    m_previewScale = 1 ;

 }
 }