Fix signatures of various image handlers methods.

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

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 40c97fc7f0ab715b0f01292c9ff76eb1dde5309e..687fea8ffa4f2e21bc413c5836421c9b085889ef 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -12,23 +12,33 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#include "wx/dcclient.h"
+#include "wx/dc.h"
+#include "wx/dcmemory.h"
+#include "wx/x11/dcclient.h"

 
 

-class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

-    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    virtual ~wxMemoryDC();
-    virtual void SelectObject( const wxBitmap& bitmap );
+    wxMemoryDCImpl( wxDC* owner );
+    wxMemoryDCImpl( wxDC* owner, wxBitmap& bitmap);
+    wxMemoryDCImpl( wxDC* owner, wxDC *dc );
+    virtual ~wxMemoryDCImpl();

 
 

+    virtual const wxBitmap& GetSelectedBitmap() const;
+    virtual wxBitmap& GetSelectedBitmap();
+    

     // implementation
     wxBitmap  m_selected;
 
 protected:
     // implementation
     wxBitmap  m_selected;
 
 protected:

-    void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);

 
 

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+private:
+    void Init();
+
+private:
+    DECLARE_CLASS(wxMemoryDCImpl)

 };
 
 #endif
 };
 
 #endif