define WINVER as 0x0400 for VC++ 6 because its headers give a warning if WINVER ...

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index c576655b05d3442eb756ef8d3bf4fbf13ea8e656..c6fa2faf9d26bd26eb70664eb989dbe1cbd2ae49 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -6,33 +6,38 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dcmemory.h"
 #endif
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class wxMemoryDC : public wxWindowDC
 {
-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-
-  public:
-    wxMemoryDC(void);
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+        
+public:
+    wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC(void);
+    ~wxMemoryDC();
+    
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height ) const;
-
-  private: 
-    friend wxPaintDC;
-    wxBitmap  m_selected;
+    
+    void DoGetSize( int *width, int *height ) const;
+    
+    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+    
+private:
+    friend class wxPaintDC;
+    
+    wxBitmap  m_bitmap;
 };
 
 #endif
-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_