Applied patch [ 1211299 ] Minor mod to wxClassInfo to improve usability

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

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 85d83bd981d166dad853a31743fea3fd5e5a32e1..39de2e1702ce0729b0b395cec1eb7125ce33ff6f 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 class WXDLLEXPORT wxMemoryDC : public wxDC
 #include "wx/dcclient.h"
 
 class WXDLLEXPORT wxMemoryDC : public wxDC


@@ -24,15 +20,21 @@ public:
     wxMemoryDC();
     wxMemoryDC(wxDC *dc); // Create compatible DC
 
     wxMemoryDC();
     wxMemoryDC(wxDC *dc); // Create compatible DC
 

-    ~wxMemoryDC();
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

     virtual void SelectObject(const wxBitmap& bitmap);
 
     virtual void SelectObject(const wxBitmap& bitmap);
 

+protected:
+    // override some base class virtuals
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

     virtual void DoGetSize(int* width, int* height) const;
 
     virtual void DoGetSize(int* width, int* height) const;
 

+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC *dc);
+
+    // initialize the newly created DC
+    void Init();
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif