Made all bitmaps 16x16

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

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 46dfe4de2f0330889d5b3211f8365784f57cb6b5..939442bd32b4d5650b470603cb968415c05da26d 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.cpp
+// Name:        src/motif/dc.cpp
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
@@ -13,10 +13,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/dc.h"
-#include "wx/dcmemory.h"
-#include "wx/defs.h"
 
-    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxDC
@@ -47,7 +49,7 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useM
     wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
 
     wxMemoryDC memDC;
-    memDC.SelectObject(bitmap);
+    memDC.SelectObjectAsSource(bitmap);
 
 #if 0
     // Not sure if we need this. The mask should leave the masked areas as per
@@ -212,4 +214,3 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 }
-