metal appearance supported under 10.3

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index 88f6d70b58f48562ba9c1e5a65935bb98dbba431..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__


@@ -16,7 +16,8 @@
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/dcprint.h"

-#include "wx/mac/uma.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.
 


@@ -42,7 +43,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     wxPrintDialogData data2;
     if ( data )
         data2 = *data;
     wxPrintDialogData data2;
     if ( data )
         data2 = *data;

-
+    

     Create(p, &data2);
 }
 
     Create(p, &data2);
 }
 


@@ -51,53 +52,29 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
     m_dialogParent = p;
     m_printerDC = NULL;
     m_destroyDC = TRUE;
     m_dialogParent = p;
     m_printerDC = NULL;
     m_destroyDC = TRUE;

-
+    

     if ( data )
         m_printDialogData = *data;
     if ( data )
         m_printDialogData = *data;

-
+    

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

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

         delete m_printerDC;
         delete m_printerDC;

+        m_printerDC = NULL;
+    }

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

-       int result = wxID_CANCEL ;
-#if !TARGET_CARBON
-       
-       OSErr err ;
-       wxString message ;
-       ::UMAPrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
-       {
-               m_printDialogData.ConvertToNative() ;
-               if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )
-               {
-                       m_printDialogData.ConvertFromNative() ;
-                       result = wxID_OK ;
-               }
-
-       }
-       else
-       {
-               message.Printf( "Print Error %d", err ) ;
-               wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
-       }
-       ::UMAPrClose() ;
-#else
-  #if __UNIX__
-    #warning "TODO:Printing for carbon"
-  #else
-    #pragma warning "TODO:Printing for carbon"
-  #endif
-#endif
-       return result ;
+    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()


@@ -106,17 +83,17 @@ wxDC *wxPrintDialog::GetPrintDC()
 }
 
 /*
 }
 
 /*

- * 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);
 }


@@ -124,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;
 }
 


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

-       int result = wxID_CANCEL ;
-#if !TARGET_CARBON
-
-       OSErr err ;
-       wxString message ;
-       ::UMAPrOpen() ;
-       err = PrError() ;
-       
-       if ( !err )
-       {
-               m_pageSetupData.ConvertToNative() ;
-               if  ( ::PrStlDialog( m_pageSetupData.GetPrintData().m_macPrintInfo ) )
-               {
-                       m_pageSetupData.ConvertFromNative() ;
-                       result = wxID_OK ;
-               }
-
-       }
-       else
-       {
-               message.Printf( "Print Error %d", err ) ;
-               wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-       }
-       ::UMAPrClose() ;
-#else
-  #if __UNIX__
-    #warning "TODO:Printing for carbon"
-  #else
-    #pragma warning "TODO:Printing for carbon"
-  #endif
-#endif
-       return result ;
+    m_pageSetupData.ConvertToNative() ;
+    int result = m_pageSetupData.GetPrintData().m_nativePrintData->ShowPageSetupDialog() ;
+    if (result == wxID_OK )
+        m_pageSetupData.ConvertFromNative() ;
+        
+    return result ;

 }
 
 }