Performance optimization

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

diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index f4e163b3edeb30db37a0caebee86a3ac615849f1..87632fc3088e576e27c655e1c1cce9b37e3e3e5f 100644 (file)
--- a/src/mac/carbon/printdlg.cpp
+++ b/src/mac/carbon/printdlg.cpp
@@ -15,10 +15,13 @@
 
 #include "wx/printdlg.h"
 
 
 #include "wx/printdlg.h"
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/object.h"
     #include "wx/dcprint.h"
     #include "wx/msgdlg.h"
     #include "wx/object.h"
     #include "wx/dcprint.h"
     #include "wx/msgdlg.h"

+    #include "wx/textctrl.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"

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


@@ -79,9 +82,12 @@ int wxMacPrintDialog::ShowModal()
     ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;
     ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;

+    
+#ifdef __LP64__
+    // TODO use NSPrintPanel
+#else

     OSErr err = noErr;
     Boolean accepted;
     OSErr err = noErr;
     Boolean accepted;

-

     err = PMSessionPrintDialog(
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession,
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSettings,
     err = PMSessionPrintDialog(
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession,
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSettings,


@@ -113,7 +119,7 @@ int wxMacPrintDialog::ShowModal()
         m_printDialogData.GetPrintData().ConvertFromNative();
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferTo( &m_printDialogData );
     }
         m_printDialogData.GetPrintData().ConvertFromNative();
         ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferTo( &m_printDialogData );
     }

-
+#endif

     return result;
 }
 
     return result;
 }
 


@@ -155,6 +161,8 @@ int wxMacPageSetupDialog::ShowModal()
     ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData );
 
     int result = wxID_CANCEL;
     ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferFrom( &m_pageSetupData );
 
     int result = wxID_CANCEL;

+#ifdef __LP64__
+#else

     OSErr err = noErr;
     Boolean accepted;
 
     OSErr err = noErr;
     Boolean accepted;
 


@@ -191,7 +199,7 @@ int wxMacPageSetupDialog::ShowModal()
         m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
         ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferTo( &m_pageSetupData );
     }
         m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
         ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferTo( &m_pageSetupData );
     }

-
+#endif

     return result;
 }
 
     return result;
 }