wxGLCanvas works again

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index c576655b05d3442eb756ef8d3bf4fbf13ea8e656..6edc56692556a04eae939b7c7e4eeaab6afb0dfd 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -18,7 +18,7 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLEXPORT wxMemoryDC: public wxWindowDC

 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 {
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 


@@ -29,9 +29,11 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     virtual void SelectObject( const wxBitmap& bitmap );
     void GetSize( int *width, int *height ) const;
 
     virtual void SelectObject( const wxBitmap& bitmap );
     void GetSize( int *width, int *height ) const;
 

+    inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+

   private: 
     friend wxPaintDC;
   private: 
     friend wxPaintDC;

-    wxBitmap  m_selected;
+    wxBitmap  m_bitmap;

 };
 
 #endif
 };
 
 #endif