Unicode compilation fixes

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index aeeff2c76b6b285ce9a14442fdcef183a28064da..1332c9d2fbb91bbd0cbfa09e4ff64cd6b2b80edc 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -12,6 +12,8 @@
 // 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/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"


@@ -20,20 +22,12 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#include "wx/dcmemory.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 

-wxMemoryDC::wxMemoryDC(void)
-{
-    CreateCompatible(NULL);
-    Init();
-} // end of wxMemoryDC::wxMemoryDC
-

 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )


@@ -118,7 +112,7 @@ bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 

-void wxMemoryDC::SelectObject(
+void wxMemoryDC::DoSelect(

   const wxBitmap&                   rBitmap
 )
 {
   const wxBitmap&                   rBitmap
 )
 {


@@ -165,6 +159,7 @@ void wxMemoryDC::SelectObject(
                    );
         m_vSelectedBitmap.SetSelectedInto(NULL);
     }
                    );
         m_vSelectedBitmap.SetSelectedInto(NULL);
     }

+

     m_vSelectedBitmap = rBitmap;
 
 
     m_vSelectedBitmap = rBitmap;