Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 51b16b19c9a192f04956b0489002727c357d170c..6cce52c26bfa0601f763e75417e8f9a96c46fb80 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/motif/dcmemory.h
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
@@ -12,32 +12,32 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#ifdef __GNUG__
-    #pragma interface "dcmemory.h"
-#endif
-
 #include "wx/dcclient.h"
 
-class wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase
 {
-DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 public:
-    wxMemoryDC();
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
     wxMemoryDC( wxDC *dc ); // Create compatible DC
-    ~wxMemoryDC();
-
-    virtual void SelectObject( const wxBitmap& bitmap );
+    virtual ~wxMemoryDC();
 
     void DoGetSize( int *width, int *height ) const;
 
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
-    friend wxPaintDC;
+    friend class wxPaintDC;
+
+    void Init();
 
     wxBitmap  m_bitmap;
 };
 
 #endif
-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_