applied patch for compilation with gcc 3.0

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

diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp
index 5f914ddbfd90632dd3091071bfd7831794f984a0..88f6d70b58f48562ba9c1e5a65935bb98dbba431 100644 (file)
--- a/src/mac/printdlg.cpp
+++ b/src/mac/printdlg.cpp
@@ -16,6 +16,7 @@
 #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"

 
 // 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.
 


@@ -66,15 +67,17 @@ wxPrintDialog::~wxPrintDialog()
 int wxPrintDialog::ShowModal()
 {
        int result = wxID_CANCEL ;
 int wxPrintDialog::ShowModal()
 {
        int result = wxID_CANCEL ;

+#if !TARGET_CARBON
+       

        OSErr err ;
        wxString message ;
        OSErr err ;
        wxString message ;

-       ::PrOpen() ;
+       ::UMAPrOpen() ;

        err = PrError() ;
        
        if ( !err )
        {
                m_printDialogData.ConvertToNative() ;
        err = PrError() ;
        
        if ( !err )
        {
                m_printDialogData.ConvertToNative() ;

-               if  ( m_printDialogData.m_macPrintInfo && ::PrJobDialog( m_printDialogData.m_macPrintInfo ) )
+               if  ( ::PrJobDialog( m_printDialogData.GetPrintData().m_macPrintInfo ) )

                {
                        m_printDialogData.ConvertFromNative() ;
                        result = wxID_OK ;
                {
                        m_printDialogData.ConvertFromNative() ;
                        result = wxID_OK ;


@@ -86,8 +89,14 @@ int wxPrintDialog::ShowModal()
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
        }
                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 ;
 }
 
        return result ;
 }
 


@@ -129,15 +138,17 @@ wxPageSetupDialog::~wxPageSetupDialog()
 int wxPageSetupDialog::ShowModal()
 {
        int result = wxID_CANCEL ;
 int wxPageSetupDialog::ShowModal()
 {
        int result = wxID_CANCEL ;

+#if !TARGET_CARBON
+

        OSErr err ;
        wxString message ;
        OSErr err ;
        wxString message ;

-       ::PrOpen() ;
+       ::UMAPrOpen() ;

        err = PrError() ;
        
        if ( !err )
        {
                m_pageSetupData.ConvertToNative() ;
        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 ;
                {
                        m_pageSetupData.ConvertFromNative() ;
                        result = wxID_OK ;


@@ -149,8 +160,14 @@ int wxPageSetupDialog::ShowModal()
                message.Printf( "Print Error %d", err ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
        }
                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 ;
 }
 
        return result ;
 }