make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for...

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

diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index a81f980166733e5fa9eac7fa67167c4f1243ed15..f71534cfcb2de23b861b5999dc306b947f884c00 100644 (file)
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_DCMEMORY_H__
@@ -14,25 +14,34 @@
 
 #include "wx/dc.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+
 public:
-    wxMemoryDC(void);
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
-    virtual void SelectObject(const wxBitmap& bitmap);
+    virtual ~wxMemoryDC(void);
+
     virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 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);
+
+private:
+    void Init();
 };
 
-#endif // __WX_COCOA_DCMEMORY_H__
+#endif
+    // __WX_COCOA_DCMEMORY_H__