fix infinite recursion typo in operator!=() (patch 1665591)

[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 b8db2f6edd57dd94b96b799002425e78755b9752..6e7e3ead4509035909acd465a4451db37fb879e9 100644 (file)
--- a/include/wx/mac/carbon/private/print.h
+++ b/include/wx/mac/carbon/private/print.h
@@ -1,18 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_PRIVATE_PRINT_H_
 #define _WX_MAC_PRIVATE_PRINT_H_
 
 #include "wx/cmndata.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_PRIVATE_PRINT_H_
 #define _WX_MAC_PRIVATE_PRINT_H_
 
 #include "wx/cmndata.h"

+#include "wx/print.h"

 #include "wx/mac/private.h"
 
 #if TARGET_CARBON && !defined(__DARWIN__)
 #include "wx/mac/private.h"
 
 #if TARGET_CARBON && !defined(__DARWIN__)


@@ -27,53 +28,30 @@
 #error "only Carbon Printing Session API is supported"
 #endif
 
 #error "only Carbon Printing Session API is supported"
 #endif
 

-class wxNativePrintData
-{
-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() ;
-} ;
-
-class wxMacCarbonPrintData : public wxNativePrintData 
+class WXDLLEXPORT wxMacCarbonPrintData : public wxPrintNativeDataBase

 {
 public :
                             wxMacCarbonPrintData() ;
 {
 public :
                             wxMacCarbonPrintData() ;

-                            ~wxMacCarbonPrintData() ;
-                            
-    virtual void            TransferFrom( wxPrintData * ) ;
-    virtual void            TransferTo( wxPrintData * )  ;
-    
+    virtual                 ~wxMacCarbonPrintData() ;
+
+    virtual bool            TransferTo( wxPrintData &data );
+    virtual bool            TransferFrom( const wxPrintData &data );
+
+    virtual bool            IsOk() const ;
+

     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)

 } ;
 
 } ;
 

-#endif
+#endif // _WX_MAC_PRIVATE_PRINT_H_