SetTextColour is gone

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index c576655b05d3442eb756ef8d3bf4fbf13ea8e656..0d453f55058b1457f9a302dc852d628d42965418 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,38 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.h
+// Name:        wx/motif/dcmemory.h

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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 WXDLLEXPORT wxMemoryDC: public wxPaintDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 
 

-  public:
-    wxMemoryDC(void);
+public:
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );

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

-    ~wxMemoryDC(void);
+    virtual ~wxMemoryDC();
+

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

-    void GetSize( int *width, int *height ) const;

 
 

-  private: 
-    friend wxPaintDC;
-    wxBitmap  m_selected;
+    void DoGetSize( int *width, int *height ) const;
+
+    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
+
+private:
+    friend class wxPaintDC;
+
+    wxBitmap  m_bitmap;

 };
 
 #endif
 };
 
 #endif

-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_