Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index 356484e6ef5367e043025db47343d733d47b8d76..0e2b5bcf0d32e75e115498bd0ef57bb498b632a2 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -12,13 +12,15 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dcprint.h"
 #endif
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
+class wxNativePrinterDC ;
+
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
@@ -33,9 +35,12 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
+    wxPrintData& GetPrintData() { return m_printData; }
+    virtual void DoGetSize( int *width, int *height ) const;
+    
  protected:
-      void*         m_macPrintSessionPort ;
-      wxPrintData   m_printData ;
+    wxPrintData   m_printData ;
+    wxNativePrinterDC* m_nativePrinterDC ;
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };