Fixed a void* to wxObject* conversion error in a return causing compile break across...

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

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 7afbb3295d640c2f22d3aa229b8147f9b4bac740..213b7e4eed79ece85084ecfba87514e2919aa75d 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -2,10 +2,9 @@
 // Name:        dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -29,20 +28,20 @@ class wxMemoryDC;
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class wxMemoryDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
+    ~wxMemoryDC();
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height );
+    void DoGetSize( int *width, int *height ) const;
 
-  private: 
-    friend wxPaintDC;
+    // implementation
     wxBitmap  m_selected;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif