Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 5d85ded03e558c153c7e346192d835f449f865ce..0a86134f666633ffadf4c858984e6e11e71b4fc2 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -12,31 +12,27 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-#pragma interface "dcmemory.h"
-#endif
-

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-class wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC, public wxMemoryDCBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-        

 public:
 public:

-    wxMemoryDC();
+    wxMemoryDC() { Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }

     wxMemoryDC( wxDC *dc ); // Create compatible DC
     wxMemoryDC( wxDC *dc ); // Create compatible DC

-    ~wxMemoryDC();
-    
-    virtual void SelectObject( const wxBitmap& bitmap );
-    
-    void DoGetSize( int *width, int *height ) const;
-    
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-    
+    virtual ~wxMemoryDC();
+
+    // implementation
+    wxBitmap  m_selected;
+
+protected:
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+

 private:
 private:

-    friend class wxPaintDC;
-    
-    wxBitmap  m_bitmap;
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 };
 
 #endif
 };
 
 #endif