warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index b06714920c6be97b881eae41a04cfabb05d2a6b3..c7eb0a1fed467df2ec1471a8428831d2770ce8aa 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -1,24 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcprint.h
 // Purpose:     wxPrinterDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
+class wxNativePrinterDC ;
+
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
@@ -33,17 +35,12 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
- protected :
- #if TARGET_CARBON
-    #if PM_USE_SESSION_APIS
-      PMPrintSession  m_macPrintSession;
-    #else
-      PMPrintContext  m_macPrintPort ;
-    #endif
- #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
 };