Better name for wxXmlResource::GetDirection() argument.

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 580fceb4badf0eb2f8bd76b9c7e42aee080721ba..6a2e3e4e4da2055971afa50a127221371ecfadbc 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,42 +1,43 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
-// Purpose:     wxMemoryDC class
+// Name:        wx/motif/dcmemory.h
+// Purpose:     wxMemoryDCImpl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcmemory.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/motif/dcclient.h"
 
-class wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
 {
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-        
 public:
-    wxMemoryDC();
-    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; }
-    
+    wxMemoryDCImpl(wxMemoryDC *owner) : wxWindowDCImpl(owner) { Init(); }
+    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+        : wxWindowDCImpl(owner)
+    {
+        Init();
+        DoSelect(bitmap);
+    }
+
+    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc);
+    virtual ~wxMemoryDCImpl();
+
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoSelect(const wxBitmap& bitmap);
+
 private:
     friend class wxPaintDC;
-    
-    wxBitmap  m_bitmap;
+
+    void Init();
+
+    wxBitmap m_bitmap;
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
 };
 
 #endif