applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index eae3b95568777cc53ac4ed40f4e0f8b6a778cd09..89f2789250c8d9f300fe459544eb2cb0f546a090 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,77 +14,86 @@
 #endif
 
 #include "wx/object.h"
 #endif
 
 #include "wx/object.h"

-#include "wx/stubs/printdlg.h"
+#include "wx/printdlg.h"

 #include "wx/dcprint.h"
 #include "wx/dcprint.h"

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

 
 // Use generic page setup dialog: use your own native one if one exists.
 
 // Use generic page setup dialog: use your own native one if one exists.

-#include "wx/generic/prntdlgg.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
 #endif
 
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
 #endif
 

-wxPrintDialog::wxPrintDialog():
- wxDialog()
+wxPrintDialog::wxPrintDialog()

 {
     m_dialogParent = NULL;
     m_printerDC = NULL;
 {
     m_dialogParent = NULL;
     m_printerDC = NULL;

+    m_destroyDC = TRUE;

 }
 
 }
 

-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data):
- wxDialog()
+wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)

 {
     Create(p, data);
 }
 
 {
     Create(p, data);
 }
 

-bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
+wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
+{
+    wxPrintDialogData data2;
+    if ( data )
+        data2 = *data;
+    
+    Create(p, &data2);
+}
+
+bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)

 {
     m_dialogParent = p;
     m_printerDC = NULL;
 {
     m_dialogParent = p;
     m_printerDC = NULL;

-
+    m_destroyDC = TRUE;
+    

     if ( data )
     if ( data )

-        m_printData = *data;
-
+        m_printDialogData = *data;
+    

     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {

-    if (m_printerDC)
+    if (m_destroyDC && m_printerDC) {

         delete m_printerDC;
         delete m_printerDC;

+        m_printerDC = NULL;
+    }

 }
 
 int wxPrintDialog::ShowModal()
 {
 }
 
 int wxPrintDialog::ShowModal()
 {

-    // TODO
-    return wxID_CANCEL;
+    m_printDialogData.ConvertToNative() ;
+    int result = m_printDialogData.GetPrintData().m_nativePrintData->ShowPrintDialog() ;
+    if ( result == wxID_OK )
+        m_printDialogData.ConvertFromNative() ;
+    
+    return result ;

 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 {

-  if (m_printerDC)
-  {
-    wxDC* dc = m_printerDC;
-    m_printerDC = NULL;
-    return dc;
-  }
-  else
-    return NULL;
+    return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;

 }
 
 /*
 }
 
 /*

- * wxPageSetupDialog
- */
+* wxPageSetupDialog
+*/

 
 wxPageSetupDialog::wxPageSetupDialog():
 
 wxPageSetupDialog::wxPageSetupDialog():

- wxDialog()
+wxDialog()

 {
 {

-  m_dialogParent = NULL;
+    m_dialogParent = NULL;

 }
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
 }
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):

- wxDialog()
+wxDialog()

 {
     Create(p, data);
 }
 {
     Create(p, data);
 }


@@ -92,10 +101,10 @@ wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
 bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
 {
     m_dialogParent = p;
 bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
 {
     m_dialogParent = p;

-
+    

     if (data)
         m_pageSetupData = (*data);
     if (data)
         m_pageSetupData = (*data);

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -105,11 +114,11 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
 
 int wxPageSetupDialog::ShowModal()
 {

-    // Uses generic page setup dialog
-    wxGenericPageSetupDialog *genericPageSetupDialog = new wxGenericPageSetupDialog(GetParent(), & m_pageSetupData);
-    int ret = genericPageSetupDialog->ShowModal();
-    m_pageSetupData = genericPageSetupDialog->GetPageSetupData();
-    genericPageSetupDialog->Close(TRUE);
-    return ret;
+    m_pageSetupData.ConvertToNative() ;
+    int result = m_pageSetupData.GetPrintData().m_nativePrintData->ShowPageSetupDialog() ;
+    if (result == wxID_OK )
+        m_pageSetupData.ConvertFromNative() ;
+        
+    return result ;

 }
 
 }