reverted wxSocket changes of rev 48723 as they broke linking under non-Unix systems

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 3d1201ce1b2fdff5ff805c89e73fc0009fe74f1a..5565670444c6e91eeed472bd8bb43d5faa3ef5f3 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/msw/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:


@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dcmemory.h"
+

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


@@ -31,8 +33,6 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-#include "wx/dcmemory.h"
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -47,23 +47,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 // wxMemoryDC
 // ----------------------------------------------------------------------------
 
 // wxMemoryDC
 // ----------------------------------------------------------------------------
 

-wxMemoryDC::wxMemoryDC()
-{
-    CreateCompatible(NULL);
-
-    Init();
-}
-

 wxMemoryDC::wxMemoryDC(wxDC *dc)
 {
     wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
 
 wxMemoryDC::wxMemoryDC(wxDC *dc)
 {
     wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
 

-    dc->BeginDrawing();
-

     CreateCompatible(dc);
 
     CreateCompatible(dc);
 

-    dc->EndDrawing();
-

     Init();
 }
 
     Init();
 }
 


@@ -92,7 +81,7 @@ bool wxMemoryDC::CreateCompatible(wxDC *dc)
     return m_ok;
 }
 
     return m_ok;
 }
 

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

 {
     // select old bitmap out of the device context
     if ( m_oldBitmap )
 {
     // select old bitmap out of the device context
     if ( m_oldBitmap )


@@ -203,4 +192,3 @@ void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord he
         wxDC::DoDrawRectangle(x, y, width, height);
     }
 }
         wxDC::DoDrawRectangle(x, y, width, height);
     }
 }

-