As per wx-dev, split the sort arrow options out to a separate parameter.

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

diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index 0c5943a18fa075d24e9e307882bbeb62752fe520..e6580bab961f74a1f1447757fab3b3566a3d461c 100644 (file)
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -4,15 +4,15 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCMEMORY_H__
 #define __WX_COCOA_DCMEMORY_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCMEMORY_H__
 #define __WX_COCOA_DCMEMORY_H__
 

-#include "wx/dcclient.h"
+#include "wx/dc.h"

 
 class WXDLLEXPORT wxMemoryDC: public wxDC
 {
 
 class WXDLLEXPORT wxMemoryDC: public wxDC
 {


@@ -20,9 +20,20 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 public:
     wxMemoryDC(void);
     wxMemoryDC( wxDC *dc ); // Create compatible DC
 public:
     wxMemoryDC(void);
     wxMemoryDC( wxDC *dc ); // Create compatible DC

-    ~wxMemoryDC(void);
+    virtual ~wxMemoryDC(void);

     virtual void SelectObject(const wxBitmap& bitmap);
     virtual void DoGetSize(int *width, int *height) const;
     virtual void SelectObject(const wxBitmap& bitmap);
     virtual void DoGetSize(int *width, int *height) const;

+protected:
+    wxBitmap m_selectedBitmap;
+    WX_NSImage m_cocoaNSImage;
+// DC stack
+    virtual bool CocoaLockFocus();
+    virtual bool CocoaUnlockFocus();
+    virtual bool CocoaGetBounds(void *rectData);
+// Blitting
+    virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
+        wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
+        int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);

 };
 
 #endif // __WX_COCOA_DCMEMORY_H__
 };
 
 #endif // __WX_COCOA_DCMEMORY_H__