changed wxPlatform implicit conversion to string to return const reference to wxStrin...

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 0d453f55058b1457f9a302dc852d628d42965418..6cce52c26bfa0601f763e75417e8f9a96c46fb80 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -14,24 +14,28 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 public:

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

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

-    virtual void SelectObject( const wxBitmap& bitmap );
-

     void DoGetSize( int *width, int *height ) const;
 
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
     void DoGetSize( int *width, int *height ) const;
 
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 

+protected:
+    virtual void DoSelect(const wxBitmap& bitmap);
+

 private:
     friend class wxPaintDC;
 
 private:
     friend class wxPaintDC;
 

+    void Init();
+

     wxBitmap  m_bitmap;
 };
 
     wxBitmap  m_bitmap;
 };