activate new xpm handler under Classic Mac OS after xpm handler fixes

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 18c7a8427e244c53973cb4c1a70e6d3882ec41ba..88f6d70b58f48562ba9c1e5a65935bb98dbba431 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -14,8 +14,9 @@
 #endif
 
 #include "wx/object.h"
-#include "wx/mac/printdlg.h"
+#include "wx/printdlg.h"
 #include "wx/dcprint.h"
+#include "wx/mac/uma.h"
 
 // Use generic page setup dialog: use your own native one if one exists.
 
@@ -24,46 +25,61 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
 #endif
 
-wxPrintDialog::wxPrintDialog():
- wxDialog()
+wxPrintDialog::wxPrintDialog()
 {
     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);
 }
 
-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_destroyDC = TRUE;
 
     if ( data )
-        m_printData = *data;
+        m_printDialogData = *data;
 
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {
+    if (m_destroyDC && m_printerDC)
+        delete m_printerDC;
 }
 
 int wxPrintDialog::ShowModal()
 {
        int result = wxID_CANCEL ;
+#if !TARGET_CARBON
+       
        OSErr err ;
        wxString message ;
-       ::PrOpen() ;
+       ::UMAPrOpen() ;
        err = PrError() ;
        
        if ( !err )
        {
-               m_printData.ConvertToNative() ;
-               if  ( m_printData.macPrintInfo && ::PrJobDialog( m_printData.macPrintInfo ) )
+               m_printDialogData.ConvertToNative() ;
+               if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )
                {
-                       m_printData.ConvertFromNative() ;
+                       m_printDialogData.ConvertFromNative() ;
                        result = wxID_OK ;
                }
 
@@ -73,14 +89,20 @@ int wxPrintDialog::ShowModal()
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
        }
-       ::PrClose() ;
-
+       ::UMAPrClose() ;
+#else
+  #if __UNIX__
+    #warning "TODO:Printing for carbon"
+  #else
+    #pragma warning "TODO:Printing for carbon"
+  #endif
+#endif
        return result ;
 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
-    return new wxPrinterDC( m_printData ) ;
+    return new wxPrinterDC( m_printDialogData.GetPrintData() ) ;
 }
 
 /*
@@ -116,15 +138,17 @@ wxPageSetupDialog::~wxPageSetupDialog()
 int wxPageSetupDialog::ShowModal()
 {
        int result = wxID_CANCEL ;
+#if !TARGET_CARBON
+
        OSErr err ;
        wxString message ;
-       ::PrOpen() ;
+       ::UMAPrOpen() ;
        err = PrError() ;
        
        if ( !err )
        {
                m_pageSetupData.ConvertToNative() ;
-               if  ( m_pageSetupData.m_macPageSetupInfo && ::PrStlDialog( m_pageSetupData.m_macPageSetupInfo ) )
+               if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )
                {
                        m_pageSetupData.ConvertFromNative() ;
                        result = wxID_OK ;
@@ -136,8 +160,14 @@ int wxPageSetupDialog::ShowModal()
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        }
-       ::PrClose() ;
-
+       ::UMAPrClose() ;
+#else
+  #if __UNIX__
+    #warning "TODO:Printing for carbon"
+  #else
+    #pragma warning "TODO:Printing for carbon"
+  #endif
+#endif
        return result ;
 }