X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52479aefae169d5c85cd0e07d159db0b8dd0a965..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/mac/carbon/private/print.h?ds=inline

diff --git a/include/wx/mac/carbon/private/print.h b/include/wx/mac/carbon/private/print.h
index d406494902..60d02597c8 100644
--- a/include/wx/mac/carbon/private/print.h
+++ b/include/wx/mac/carbon/private/print.h
@@ -13,6 +13,7 @@
 #define _WX_MAC_PRIVATE_PRINT_H_
 
 #include "wx/cmndata.h"
+#include "wx/print.h"
 #include "wx/mac/private.h"
 
 #if TARGET_CARBON && !defined(__DARWIN__)
@@ -23,85 +24,34 @@
 #  include "Printing.h"
 #endif
 
-#if TARGET_CARBON 
 #if !PM_USE_SESSION_APIS
 #error "only Carbon Printing Session API is supported"
 #endif
-#endif
 
-class wxNativePrintData
+class WXDLLEXPORT wxMacCarbonPrintData : public wxPrintNativeDataBase 
 {
 public :
-                            wxNativePrintData() {}
-    virtual                 ~wxNativePrintData() {}
-    
-    virtual void            TransferFrom( wxPrintData * ) = 0 ;
-    virtual void            TransferTo( wxPrintData * ) = 0 ;
-    
-    virtual void            TransferFrom( wxPageSetupDialogData * ) = 0 ;
-    virtual void            TransferTo( wxPageSetupDialogData * ) = 0 ;
-    
-    virtual void            TransferFrom( wxPrintDialogData * ) = 0 ;
-    virtual void            TransferTo( wxPrintDialogData * ) = 0 ;
-    
-    virtual void            CopyFrom( wxNativePrintData * ) = 0;
- 
-    virtual int             ShowPrintDialog() = 0 ;
-    virtual int             ShowPageSetupDialog() = 0 ;
-   
-    static wxNativePrintData* Create() ;
-} ;
+                            wxMacCarbonPrintData() ;
+    virtual                 ~wxMacCarbonPrintData() ;
 
-#if TARGET_CARBON
+    virtual bool            TransferTo( wxPrintData &data );
+    virtual bool            TransferFrom( const wxPrintData &data );
 
-class wxMacCarbonPrintData : public wxNativePrintData 
-{
-public :
-                            wxMacCarbonPrintData() ;
-                            ~wxMacCarbonPrintData() ;
-                            
-    virtual void            TransferFrom( wxPrintData * ) ;
-    virtual void            TransferTo( wxPrintData * )  ;
+    virtual bool            Ok() const ;
     
     virtual void            TransferFrom( wxPageSetupDialogData * )  ;
     virtual void            TransferTo( wxPageSetupDialogData * ) ;
     
     virtual void            TransferFrom( wxPrintDialogData * )  ;
     virtual void            TransferTo( wxPrintDialogData * ) ;
-    
-    virtual void            CopyFrom( wxNativePrintData * ) ;
-    virtual int             ShowPrintDialog() ;
-    virtual int             ShowPageSetupDialog() ;
 private :
     virtual void            ValidateOrCreate() ;
 public :
     PMPrintSession			m_macPrintSession ;
     PMPageFormat            m_macPageFormat ;
     PMPrintSettings         m_macPrintSettings ;
+private:
+    DECLARE_DYNAMIC_CLASS(wxMacCarbonPrintData)
 } ;
 
-#else
-
-class wxMacClassicPrintData : public wxNativePrintData
-{
-public :
-                            wxMacClassicPrintData() ;
-                            ~wxMacClassicPrintData() ;
-    virtual void            TransferFrom( wxPrintData * ) ;
-    virtual void            TransferTo( wxPrintData * )  ;
-    virtual void            TransferFrom( wxPageSetupDialogData * ) ;
-    virtual void            TransferTo( wxPageSetupDialogData * ) ;
-    virtual void            TransferFrom( wxPrintDialogData * )  ;
-    virtual void            TransferTo( wxPrintDialogData * ) ;
-    virtual void            CopyFrom( wxNativePrintData * ) ;
-    virtual int             ShowPrintDialog() ;
-    virtual int             ShowPageSetupDialog() ;
-private :
-    virtual void            ValidateOrCreate() ;
-public :
-    THPrint                 m_macPrintSettings ;
-} ;
-
-#endif
-
 #endif