Changes to template Connect() to make it compile with MSVC7 and possible other

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

diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index f71534cfcb2de23b861b5999dc306b947f884c00..577eee0480ab877e93fe53a16d43fbc29c8d1a97 100644 (file)
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcmemory.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/dcmemory.h

-// Purpose:     wxMemoryDC class
+// Purpose:     wxMemoryDCImpl class

 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16


@@ -12,17 +12,25 @@
 #ifndef __WX_COCOA_DCMEMORY_H__
 #define __WX_COCOA_DCMEMORY_H__
 
 #ifndef __WX_COCOA_DCMEMORY_H__
 #define __WX_COCOA_DCMEMORY_H__
 

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

 
 

-class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase
+#include "wx/dcmemory.h"
+
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxCocoaDCImpl

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)

 
 public:
 
 public:

-    wxMemoryDC() { Init(); }
-    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    virtual ~wxMemoryDC(void);
+    wxMemoryDCImpl(wxMemoryDC *owner)
+    :   wxCocoaDCImpl(owner)
+    {   Init(); }
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+    :   wxCocoaDCImpl(owner)
+    {   Init();
+        owner->SelectObject(bitmap);
+    }
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc ); // Create compatible DC
+    virtual ~wxMemoryDCImpl(void);

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


@@ -37,7 +45,7 @@ protected:
 // Blitting
     virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
         wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
 // Blitting
     virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
         wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,

-        int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);
+        wxRasterOperationMode logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);

 
 private:
     void Init();
 
 private:
     void Init();