Getting various compilers to work with wxWin again

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

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 7039c610c169c66c1eaf6cf2d35fdacc6a4f8ea2..5ba8eb59e85441b8ce675fdcda7bfd04df3f0ca0 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"
@@ -28,8 +28,8 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 
   ~wxMemoryDC(void);
   virtual void SelectObject(const wxBitmap& bitmap);
-  virtual void GetSize(int* width, int* height) const;
+  virtual void DoGetSize(int* width, int* height) const;
 };
 
 #endif
-    // __DCMEMORYH__
+    // _WX_DCMEMORY_H_