added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 6cce52c26bfa0601f763e75417e8f9a96c46fb80..2ef13d624775a005e372cca8163d7c7d30663117 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/motif/dcmemory.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/motif/dcmemory.h

-// Purpose:     wxMemoryDC class
+// Purpose:     wxMemoryDCImpl class

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -12,23 +12,23 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#include "wx/dcclient.h"
+#include "wx/motif/dcclient.h"

 
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
-

 public:
 public:

-    wxMemoryDC() { Init(); }
-    wxMemoryDC(wxBitmap& bitmap) { Init(); SelectObject(bitmap); }
-    wxMemoryDC( wxDC *dc ); // Create compatible DC
-    virtual ~wxMemoryDC();
-
-    void DoGetSize( int *width, int *height ) const;
-
-    wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
-
-protected:
+    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:
     virtual void DoSelect(const wxBitmap& bitmap);
 
 private:


@@ -36,7 +36,9 @@ private:
 
     void Init();
 
 
     void Init();
 

-    wxBitmap  m_bitmap;
+    wxBitmap m_bitmap;
+
+    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)

 };
 
 #endif
 };
 
 #endif