no changes, just remove #if'd out code

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

diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 5ae0e64a2852e3ac8d6e8e7b74554af1794c24b7..382d79b01c580d40f374951caa495b55e2f4bab5 100644 (file)
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -1,5 +1,46 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcmemory.h"
-#else
-#include "wx/mac/carbon/dcmemory.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dcmemory.h
+// Purpose:     wxMemoryDC class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DCMEMORY_H_
+#define _WX_DCMEMORY_H_
+
+#include "wx/osx/dcclient.h"
+
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
+{
+public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); 
+    
+    virtual ~wxMemoryDCImpl();
+
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+       { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual const wxBitmap& GetSelectedBitmap() const
+        { return m_selected; }
+    virtual wxBitmap& GetSelectedBitmap()
+        { return m_selected; }
+    
+private:
+    void Init();
+
+    wxBitmap  m_selected;
+    
+    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+};
+
 #endif
+    // _WX_DCMEMORY_H_