No changes, synchronised source names that appear commented at the top of files with...

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index f2db0f212c9b556a0329ecefd0e13eb92e48e463..b4f268db1ddd49df7bce221a8ab7f6fea6d2451f 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.h
+// Name:        wx/os2/dcmemory.h

 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:


@@ -12,28 +12,33 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/os2/dc.h"

 
 

-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-
-    ~wxMemoryDC(void);
-    virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
-
-  private:
-    friend wxPaintDC;
-    wxBitmap  m_selected;
-};
+public:
+    wxMemoryDCImpl( wxMemoryDC *owner );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC* pDC); // Create compatible DC
+
+    // override some base class virtuals
+    virtual void DoGetSize(int* pWidth, int* pHeight) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
+
+protected:
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC* pDC);
+
+    // initialize the newly created DC
+    void Init(void);
+private:
+    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+}; // end of CLASS wxMemoryDCImpl

 
 #endif
     // _WX_DCMEMORY_H_
 
 #endif
     // _WX_DCMEMORY_H_