X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..7912e6332f65d8c975df0a7bd64a0c2d8445c63f:/include/wx/mac/dc.h

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 115742d796..679130d65b 100644
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dc.h"
 #endif
 
@@ -50,7 +50,8 @@ class wxMacPortStateHelper ;
 
 class WXDLLEXPORT wxDC: public wxDCBase
 {
-  DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_NO_COPY_CLASS(wxDC)
 
   public:
 
@@ -189,7 +190,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
 //
 
 protected:
-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
@@ -274,10 +275,18 @@ protected:
 	mutable bool	m_macPenInstalled ;
 	mutable bool	m_macBrushInstalled ;
 	
-	WXHRGN				m_macBoundaryClipRgn ;
-	WXHRGN               m_macCurrentClipRgn ;
+	WXHRGN				    m_macBoundaryClipRgn ;
+	WXHRGN                  m_macCurrentClipRgn ;
 	wxPoint					m_macLocalOrigin ;
 	void					MacSetupPort( wxMacPortStateHelper* ph ) const ;
+	void                    MacCleanupPort( wxMacPortStateHelper* ph ) const ;
+	mutable void*                   m_macATSUIStyle ;
+	mutable wxMacPortStateHelper*   m_macCurrentPortStateHelper ;
+	mutable bool                    m_macFormerAliasState ;
+	mutable short                   m_macFormerAliasSize ;
+	mutable bool                    m_macAliasWasEnabled ;
+	mutable void*                   m_macForegroundPixMap ;
+	mutable void*                   m_macBackgroundPixMap ;
 };
 
 #endif