there is no need to convert wxArrayString to wxString[] explicitly any more, wx contr...

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index aeeff2c76b6b285ce9a14442fdcef183a28064da..770e42bce458316b084417df267d767f9031c381 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,18 +22,19 @@
 
 #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)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )

 {
     CreateCompatible(NULL);
     Init();
 {
     CreateCompatible(NULL);
     Init();

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

 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(
 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(