move more socket functions common to Winsock and BSD implementations to common code

[wxWidgets.git] / src / motif / dcmemory.cpp

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 789dac864d6848c09506ed7f5e7ea43683e45b84..79b11e38e6b34ca7bc082f5ca5a08bb5dd18cc9b 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/motif/dcmemory.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/motif/dcmemory.cpp

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

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -12,11 +12,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcmemory.h"
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/settings.h"

+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -28,14 +28,15 @@
 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"

+#include "wx/motif/dcmemory.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)

 
 

-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+void wxMemoryDCImpl::Init()

 {
     m_ok = true;
     m_display = wxGetDisplay();
 {
     m_ok = true;
     m_display = wxGetDisplay();


@@ -57,16 +58,14 @@ wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-    
-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC* dc )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC* dc)
+              : wxWindowDCImpl(owner)

 {
     m_ok = true;
     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
 {
     m_ok = true;
     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))

-        m_display = ((wxWindowDC*)dc)->GetDisplay();
+        m_display = ((wxWindowDCImpl *)dc->GetImpl())->GetDisplay();

     else
         m_display = wxGetDisplay();
 
     else
         m_display = wxGetDisplay();
 


@@ -88,11 +87,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
     SetPen (* wxBLACK_PEN);
 }
 
     SetPen (* wxBLACK_PEN);
 }
 

-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDCImpl::~wxMemoryDCImpl(void)

 {
 }
 
 {
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     m_bitmap = bitmap;
 
 {
     m_bitmap = bitmap;
 


@@ -128,7 +127,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     };
 }
 
     };
 }
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
     if (m_bitmap.Ok())
     {
 {
     if (m_bitmap.Ok())
     {