ATSU Support in font extended

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

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index a053eb7d805f6401486e0575c8d7c1a59ec0f558..834d523ccf5616e65210ae22c0d328d13e2d213a 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "printwin.h"
 #endif
 
 #pragma implementation "printwin.h"
 #endif
 


@@ -20,8 +20,6 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"


@@ -29,16 +27,15 @@
 #include "wx/msgdlg.h"
 #endif
 
 #include "wx/msgdlg.h"
 #endif
 

+#include "wx/math.h"

 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 

-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
-

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

+#include "wx/mac/printdlg.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -699,6 +696,7 @@ wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
 
 bool wxMacPrinter::Setup(wxWindow *parent)
 {
 
 bool wxMacPrinter::Setup(wxWindow *parent)
 {

+#if 0

     wxPrintDialog dialog(parent, & m_printDialogData);
     dialog.GetPrintDialogData().SetSetupDialog(TRUE);
     
     wxPrintDialog dialog(parent, & m_printDialogData);
     dialog.GetPrintDialogData().SetSetupDialog(TRUE);
     


@@ -710,6 +708,8 @@ bool wxMacPrinter::Setup(wxWindow *parent)
     }
     
     return (ret == wxID_OK);
     }
     
     return (ret == wxID_OK);

+#endif
+    return wxID_CANCEL;

 }
 
 /*
 }
 
 /*