use correct scale when drawing

[wxWidgets.git] / src / osx / carbon / printdlg.cpp

diff --git a/src/osx/carbon/printdlg.cpp b/src/osx/carbon/printdlg.cpp
index 0232701404f2ec87723d887792e23b0eb7187094..0729a4770a5887bc1f37e499547b17d8e2d07302 100644 (file)
--- a/src/osx/carbon/printdlg.cpp
+++ b/src/osx/carbon/printdlg.cpp
@@ -28,19 +28,24 @@
 #include "wx/osx/private/print.h"
 #include "wx/osx/private.h"
 #include "wx/statline.h"
 #include "wx/osx/private/print.h"
 #include "wx/osx/private.h"
 #include "wx/statline.h"

+#include "wx/modalhook.h"

 
 int wxMacPrintDialog::ShowModal()
 {
 
 int wxMacPrintDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     m_printDialogData.GetPrintData().ConvertToNative();
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;
     m_printDialogData.GetPrintData().ConvertToNative();
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;

-    
+

     OSErr err = noErr;
     Boolean accepted;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData();
     OSErr err = noErr;
     Boolean accepted;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData();

+    wxDialog::OSXBeginModalDialog();

     err = PMSessionPrintDialog(nativeData->GetPrintSession(), nativeData->GetPrintSettings(),
         nativeData->GetPageFormat(), &accepted );
     err = PMSessionPrintDialog(nativeData->GetPrintSession(), nativeData->GetPrintSettings(),
         nativeData->GetPageFormat(), &accepted );

+    wxDialog::OSXEndModalDialog();

 
     if ((err == noErr) && !accepted)
     {
 
     if ((err == noErr) && !accepted)
     {


@@ -72,6 +77,8 @@ int wxMacPrintDialog::ShowModal()
 
 int wxMacPageSetupDialog::ShowModal()
 {
 
 int wxMacPageSetupDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     m_pageSetupData.GetPrintData().ConvertToNative();
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_pageSetupData.GetPrintData().GetNativeData();
     nativeData->TransferFrom( &m_pageSetupData );
     m_pageSetupData.GetPrintData().ConvertToNative();
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_pageSetupData.GetPrintData().GetNativeData();
     nativeData->TransferFrom( &m_pageSetupData );


@@ -80,8 +87,10 @@ int wxMacPageSetupDialog::ShowModal()
     OSErr err = noErr;
     Boolean accepted;
 
     OSErr err = noErr;
     Boolean accepted;
 

+    wxDialog::OSXBeginModalDialog();

     err = PMSessionPageSetupDialog( nativeData->GetPrintSession(), nativeData->GetPageFormat(),
         &accepted );
     err = PMSessionPageSetupDialog( nativeData->GetPrintSession(), nativeData->GetPageFormat(),
         &accepted );

+    wxDialog::OSXEndModalDialog();

 
     if ((err == noErr) && !accepted)
     {
 
     if ((err == noErr) && !accepted)
     {