X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e0ea95b6f745b4f9c8208dd940fe1d59c2891fd7:/src/mac/printdlg.cpp

diff --git a/src/mac/printdlg.cpp b/src/mac/printdlg.cpp
index 1b18c1d49b..779ee74edd 100644
--- a/src/mac/printdlg.cpp
+++ b/src/mac/printdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -19,7 +19,7 @@
 #include "wx/msgdlg.h"
 #include "wx/mac/uma.h"
 #ifndef __DARWIN__
-    #include "Printing.h"
+#include "Printing.h"
 #endif
 
 #if defined(TARGET_CARBON) && !defined(__DARWIN__)
@@ -53,7 +53,7 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     wxPrintDialogData data2;
     if ( data )
         data2 = *data;
-
+    
     Create(p, &data2);
 }
 
@@ -62,10 +62,10 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
     m_dialogParent = p;
     m_printerDC = NULL;
     m_destroyDC = TRUE;
-
+    
     if ( data )
         m_printDialogData = *data;
-
+    
     return TRUE;
 }
 
@@ -79,31 +79,31 @@ wxPrintDialog::~wxPrintDialog()
 
 int wxPrintDialog::ShowModal()
 {
-	int result = wxID_CANCEL ;
-	OSErr err ;
-	wxString message ;
-
-#if !TARGET_CARBON	
-	err = ::UMAPrOpen(NULL) ;
-	if ( err == noErr )
-	{
-		m_printDialogData.ConvertToNative() ;
-		if  ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintSettings ) )
-		{
-			m_printDialogData.ConvertFromNative() ;
-			result = wxID_OK ;
-		}
-
-	}
-	else
-	{
-		message.Printf( "Print Error %d", err ) ;
-		wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
-		dialog.ShowModal();
-	}
-	::UMAPrClose(NULL) ;
+    int result = wxID_CANCEL ;
+    OSErr err ;
+    wxString message ;
+    
+#if !TARGET_CARBON    
+    err = ::UMAPrOpen(NULL) ;
+    if ( err == noErr )
+    {
+        m_printDialogData.ConvertToNative() ;
+        if  ( ::PrJobDialog( (THPrint) m_printDialogData.GetPrintData().m_macPrintSettings ) )
+        {
+            m_printDialogData.ConvertFromNative() ;
+            result = wxID_OK ;
+        }
+        
+    }
+    else
+    {
+        message.Printf( "Print Error %d", err ) ;
+        wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
+        dialog.ShowModal();
+    }
+    ::UMAPrClose(NULL) ;
 #else
-  #if PM_USE_SESSION_APIS
+#if PM_USE_SESSION_APIS
     Boolean        accepted;
     
     {
@@ -121,16 +121,16 @@ int wxPrintDialog::ShowModal()
                 (m_printDialogData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
                 err = PMSessionDefaultPageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                                                 (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);
+                    (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat);
             }
         }
         else
         {
             err = PMSessionValidatePageFormat((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                                              (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
-                                              kPMDontWantBoolean);
+                (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
+                kPMDontWantBoolean);
         }
-	
+        
         //  Set up a valid PrintSettings object.
         if (m_printDialogData.GetPrintData().m_macPrintSettings == kPMNoPrintSettings)
         {
@@ -143,14 +143,14 @@ int wxPrintDialog::ShowModal()
                 (m_printDialogData.GetPrintData().m_macPrintSettings != kPMNoPrintSettings))
             {
                 err = PMSessionDefaultPrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                                                    (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);
+                    (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings);
             }
         }
         else
         {
             err = PMSessionValidatePrintSettings((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                                                 (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
-                                                 kPMDontWantBoolean);
+                (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
+                kPMDontWantBoolean);
         }
         //  Set a valid page range before displaying the Print dialog
         if (err == noErr)
@@ -163,9 +163,9 @@ int wxPrintDialog::ShowModal()
         if (err == noErr)
         {
             err = PMSessionPrintDialog((PMPrintSession)m_printDialogData.GetPrintData().m_macPrintSession,
-                                       (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
-                                       (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
-                                       &accepted);
+                (PMPrintSettings)m_printDialogData.GetPrintData().m_macPrintSettings,
+                (PMPageFormat)m_printDialogData.GetPrintData().m_macPageFormat,
+                &accepted);
             if ((err == noErr) && !accepted)
             {
                 err = kPMCancel; // user clicked Cancel button
@@ -183,11 +183,11 @@ int wxPrintDialog::ShowModal()
         wxMessageDialog dialog( NULL , message  , "", wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
-  #else
-    #pragma warning "TODO: Printing for carbon without session apis"
-  #endif
+#else
+#pragma warning "TODO: Printing for carbon without session apis"
 #endif
-	return result ;
+#endif
+    return result ;
 }
 
 wxDC *wxPrintDialog::GetPrintDC()
@@ -196,17 +196,17 @@ wxDC *wxPrintDialog::GetPrintDC()
 }
 
 /*
- * wxPageSetupDialog
- */
+* wxPageSetupDialog
+*/
 
 wxPageSetupDialog::wxPageSetupDialog():
- wxDialog()
+wxDialog()
 {
-  m_dialogParent = NULL;
+    m_dialogParent = NULL;
 }
 
 wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
- wxDialog()
+wxDialog()
 {
     Create(p, data);
 }
@@ -214,10 +214,10 @@ wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data):
 bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
 {
     m_dialogParent = p;
-
+    
     if (data)
         m_pageSetupData = (*data);
-
+    
     return TRUE;
 }
 
@@ -227,31 +227,31 @@ wxPageSetupDialog::~wxPageSetupDialog()
 
 int wxPageSetupDialog::ShowModal()
 {
-	int      result = wxID_CANCEL ;
-	OSErr    err ;
-	wxString message ;
-
+    int      result = wxID_CANCEL ;
+    OSErr    err ;
+    wxString message ;
+    
 #if !TARGET_CARBON
-	err = ::UMAPrOpen(NULL) ;
-	if ( err == noErr )
-	{
-		m_pageSetupData.ConvertToNative() ;
-		if  ( ::PrStlDialog(  (THPrint) m_pageSetupData.GetPrintData().m_macPrintSettings ) )
-		{
-			m_pageSetupData.ConvertFromNative() ;
-			result = wxID_OK ;
-		}
-
-	}
-	else
-	{
-		message.Printf( "Print Error %d", err ) ;
-		wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
-		dialog.ShowModal();
-	}
-	::UMAPrClose(NULL) ;
+    err = ::UMAPrOpen(NULL) ;
+    if ( err == noErr )
+    {
+        m_pageSetupData.ConvertToNative() ;
+        if  ( ::PrStlDialog(  (THPrint) m_pageSetupData.GetPrintData().m_macPrintSettings ) )
+        {
+            m_pageSetupData.ConvertFromNative() ;
+            result = wxID_OK ;
+        }
+        
+    }
+    else
+    {
+        message.Printf( "Print Error %d", err ) ;
+        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
+        dialog.ShowModal();
+    }
+    ::UMAPrClose(NULL) ;
 #else
-  #if PM_USE_SESSION_APIS
+#if PM_USE_SESSION_APIS
     Boolean        accepted;
     
     {
@@ -269,22 +269,22 @@ int wxPageSetupDialog::ShowModal()
                 (m_pageSetupData.GetPrintData().m_macPageFormat != kPMNoPageFormat))
             {
                 err = PMSessionDefaultPageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                                                 (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);
+                    (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat);
             }
         }
         else
         {
             err = PMSessionValidatePageFormat((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                                              (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
-                                              kPMDontWantBoolean);
+                (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
+                kPMDontWantBoolean);
         }
         
         //  Display the Page Setup dialog.
         if (err == noErr)
         {
             err = PMSessionPageSetupDialog((PMPrintSession)m_pageSetupData.GetPrintData().m_macPrintSession,
-                                           (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
-                                           &accepted);
+                (PMPageFormat)m_pageSetupData.GetPrintData().m_macPageFormat,
+                &accepted);
             if ((err == noErr) && !accepted)
             {
                 err = kPMCancel; // user clicked Cancel button
@@ -305,10 +305,10 @@ int wxPageSetupDialog::ShowModal()
         wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
         dialog.ShowModal();
     }
-  #else
-    #pragma warning "TODO: Printing for carbon without session apis"
-  #endif
+#else
+#pragma warning "TODO: Printing for carbon without session apis"
+#endif
 #endif
-	return result ;
+    return result ;
 }