set eol-style

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

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 627027cb2d847fdcfba2d4441421570c423b3630..07927df52c99eb43cce26017beef2904ff6f3a08 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -6,7 +6,7 @@
 // Created:     09/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     09/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_


@@ -14,18 +14,20 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLEXPORT wxMemoryDC: public wxDC, public wxMemoryDCBase

 {
 public:
 {
 public:

-    wxMemoryDC(void);
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }

     wxMemoryDC(wxDC* pDC); // Create compatible DC
 
     wxMemoryDC(wxDC* pDC); // Create compatible DC
 

-    virtual void SelectObject(const wxBitmap& rBitmap);

 protected:
     // override some base class virtuals
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
                           ) const;
 protected:
     // override some base class virtuals
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
                           ) const;

+    virtual void DoSelect(const wxBitmap& bitmap);
+

     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC* pDC);
 
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC* pDC);