removed extra wxCalendarCtrl:: which is ignored by MSVC for some reason but breaks...

[wxWidgets.git] / include / wx / mac / carbon / private / print.h

diff --git a/include/wx/mac/carbon/private/print.h b/include/wx/mac/carbon/private/print.h
index d406494902a75c21192192ee23f85320f5b4dfbe..31d880033c3f0b9da43aa9a3660e843f38496ed1 100644 (file)
--- a/include/wx/mac/carbon/private/print.h
+++ b/include/wx/mac/carbon/private/print.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        print.h
+// Name:        wx/mac/carbon/private/print.h

 // Purpose:     private implementation for printing on MacOS
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
 // Purpose:     private implementation for printing on MacOS
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,95 +13,33 @@
 #define _WX_MAC_PRIVATE_PRINT_H_
 
 #include "wx/cmndata.h"
 #define _WX_MAC_PRIVATE_PRINT_H_
 
 #include "wx/cmndata.h"

+#include "wx/print.h"

 #include "wx/mac/private.h"
 
 #include "wx/mac/private.h"
 

-#if TARGET_CARBON && !defined(__DARWIN__)
-#  include <PMApplication.h>
-#endif
-
-#ifndef __DARWIN__
-#  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 WXDLLIMPEXP_CORE wxMacCarbonPrintData : public wxPrintNativeDataBase

 {
 public :
 {
 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 );
+
+    virtual bool            IsOk() const ;

 
 

-class wxMacCarbonPrintData : public wxNativePrintData 
-{
-public :
-                            wxMacCarbonPrintData() ;
-                            ~wxMacCarbonPrintData() ;
-                            
-    virtual void            TransferFrom( wxPrintData * ) ;
-    virtual void            TransferTo( wxPrintData * )  ;
-    

     virtual void            TransferFrom( wxPageSetupDialogData * )  ;
     virtual void            TransferTo( wxPageSetupDialogData * ) ;
     virtual void            TransferFrom( wxPageSetupDialogData * )  ;
     virtual void            TransferTo( wxPageSetupDialogData * ) ;

-    
+

     virtual void            TransferFrom( wxPrintDialogData * )  ;
     virtual void            TransferTo( wxPrintDialogData * ) ;
     virtual void            TransferFrom( wxPrintDialogData * )  ;
     virtual void            TransferTo( wxPrintDialogData * ) ;

-    
-    virtual void            CopyFrom( wxNativePrintData * ) ;
-    virtual int             ShowPrintDialog() ;
-    virtual int             ShowPageSetupDialog() ;

 private :
     virtual void            ValidateOrCreate() ;
 public :
 private :
     virtual void            ValidateOrCreate() ;
 public :

-    PMPrintSession                     m_macPrintSession ;
+    PMPrintSession          m_macPrintSession ;

     PMPageFormat            m_macPageFormat ;
     PMPrintSettings         m_macPrintSettings ;
     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
+#endif // _WX_MAC_PRIVATE_PRINT_H_