fixes to previous commit

[wxWidgets.git] / include / wx / mac / dcprint.h

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index e2e11819a37fde60218af3a8b53973c809a7fee0..c7eb0a1fed467df2ec1471a8428831d2770ce8aa 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -1,29 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcprint.h
 // Purpose:     wxPrinterDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcprint.h
 // Purpose:     wxPrinterDC class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 

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

 #pragma interface "dcprint.h"
 #endif
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #pragma interface "dcprint.h"
 #endif
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 

+class wxNativePrinterDC ;
+

 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
   DECLARE_CLASS(wxPrinterDC)
 
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
   DECLARE_CLASS(wxPrinterDC)
 

+#if wxUSE_PRINTING_ARCHITECTURE

   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
   ~wxPrinterDC();
   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
   ~wxPrinterDC();


@@ -32,13 +35,13 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;

- protected :
- #if TARGET_CARBON
-       PMPrintContext  m_macPrintPort ;
- #else
-       TPPrPort        m_macPrintPort ;
- #endif
-       wxPrintData m_printData ;
+    wxPrintData& GetPrintData() { return m_printData; }
+    virtual void DoGetSize( int *width, int *height ) const;
+    
+ protected:
+    wxPrintData   m_printData ;
+    wxNativePrinterDC* m_nativePrinterDC ;
+#endif // wxUSE_PRINTING_ARCHITECTURE

 };
 
 #endif
 };
 
 #endif