Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 115742d7966534ebeac7a09ec38cf431d4ede458..679130d65bc2478b4c7618b720d3130f7411e2fa 100644 (file)
--- 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