wxMac GSocket C -> C++

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

diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h
index dd4b3fdbe57ff0553fbdb9ca21bca83baf8112fa..2eb8eb54293a182c75e1e4b9a79a8d2aded9b03a 100644 (file)
--- a/include/wx/cocoa/dc.h
+++ b/include/wx/cocoa/dc.h
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DC_H__
@@ -46,7 +46,7 @@ protected:
     bool CocoaUnwindStackAndTakeFocus();
     inline bool CocoaTakeFocus()
     {
-        wxCocoaDCStack::Node *node = sm_cocoaDCStack.GetFirst();
+        wxCocoaDCStack::compatibility_iterator node = sm_cocoaDCStack.GetFirst();
         if(node && (node->GetData() == this))
             return true;
         return CocoaUnwindStackAndTakeFocus();
@@ -56,6 +56,10 @@ protected:
     void CocoaApplyTransformations();
     float m_cocoaHeight;
     bool m_cocoaFlipped;
+// Blitting
+    virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
+        wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
+        int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);
 //-------------------------------------------------------------------------
 // Implementation
 //-------------------------------------------------------------------------