Mostly Mingw32/Cygwin corrections

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

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 7039c610c169c66c1eaf6cf2d35fdacc6a4f8ea2..da908bf3a489f4e3304413aefbe262d42f2824e2 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -5,12 +5,12 @@
 // 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__
+#ifndef _WX_DCMEMORY_H_
+#define _WX_DCMEMORY_H_
 
 #ifdef __GNUG__
 #pragma interface "dcmemory.h"
@@ -18,18 +18,21 @@
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxDC
+class WXDLLEXPORT wxMemoryDC : public wxDC
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+public:
+    wxMemoryDC();
+    wxMemoryDC(wxDC *dc); // Create compatible DC
 
- public:
-  wxMemoryDC(void);
-  wxMemoryDC(wxDC *dc); // Create compatible DC
+    ~wxMemoryDC();
 
-  ~wxMemoryDC(void);
-  virtual void SelectObject(const wxBitmap& bitmap);
-  virtual void GetSize(int* width, int* height) const;
+    virtual void SelectObject(const wxBitmap& bitmap);
+
+    virtual void DoGetSize(int* width, int* height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif
-    // __DCMEMORYH__
+    // _WX_DCMEMORY_H_