Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 7039c610c169c66c1eaf6cf2d35fdacc6a4f8ea2..20f2005856939a734573a929f9079141eac79625 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -1,35 +1,42 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCMEMORYH__
-#define __DCMEMORYH__
-
-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
+#ifndef _WX_DCMEMORY_H_
+#define _WX_DCMEMORY_H_

 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }
+    wxMemoryDC(wxDC *dc); // Create compatible DC
+
+
+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 DoSelect(const wxBitmap& bitmap);
+
+    // create DC compatible with the given one or screen if dc == NULL
+    bool CreateCompatible(wxDC *dc);

 
 

- public:
-  wxMemoryDC(void);
-  wxMemoryDC(wxDC *dc); // Create compatible DC
+    // initialize the newly created DC
+    void Init();

 
 

-  ~wxMemoryDC(void);
-  virtual void SelectObject(const wxBitmap& bitmap);
-  virtual void GetSize(int* width, int* height) const;
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif

-    // __DCMEMORYH__
+    // _WX_DCMEMORY_H_