simplify the client data/non standard images handling code by unconditionally using...

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

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 5d85ded03e558c153c7e346192d835f449f865ce..5fd1114288557668b0c7325c4c5df1361a20ef0b 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -12,31 +12,23 @@
 #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
 {
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-        
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC();
-    
     virtual void SelectObject( const wxBitmap& bitmap );
-    
+
+    // implementation
+    wxBitmap  m_selected;
+
+protected:
     void DoGetSize( int *width, int *height ) const;
-    
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-    
-private:
-    friend class wxPaintDC;
-    
-    wxBitmap  m_bitmap;
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
 #endif