Update to Scintilla 1.48

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

diff --git a/include/wx/mac/dcprint.h b/include/wx/mac/dcprint.h
index f699f65351c0a05b0d84837adeb66c1b7ae9674a..cc581688d3b54a19dfd81bcdc24934bcbb478446 100644 (file)
--- a/include/wx/mac/dcprint.h
+++ b/include/wx/mac/dcprint.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcprint.h"
 #endif
 
@@ -33,17 +33,9 @@ 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_macPrintPort ;
-    #else
-      PMPrintContext  m_macPrintPort ;
-    #endif
- #else
-      TPPrPort         m_macPrintPort ;
- #endif
-      wxPrintData m_printData ;
+ protected:
+      void*         m_macPrintSessionPort ;
+      wxPrintData   m_printData ;
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };