Chianti, Pinot noir, WINE..

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index dd76ffcd3acbca5546bf0c4b2e6645f9704deee8..60bbb50735c0f9ddee71baed659b8da2870ad71b 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -90,17 +90,17 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
   // JACS 11/12/98: disabling this since the Forty Thieves sample
   // shows this not working properly. In fact, if loading from a resource,
   // the depth should become the screen depth, so why was it being called?
-  if (0)
-  {
-      // Make a new bitmap that has the correct depth.
-      wxBitmap newBitmap = bitmap.GetBitmapForDC(* this);
-
-      m_selectedBitmap = newBitmap ;
-  }
-  else
-  {
+//  if (0)
+//  {
+//      // Make a new bitmap that has the correct depth.
+//      wxBitmap newBitmap = bitmap.GetBitmapForDC(* this);
+//
+//      m_selectedBitmap = newBitmap ;
+//  }
+//  else
+//  {
       m_selectedBitmap = bitmap;
-  }
+//  }
 
   if (!m_selectedBitmap.Ok())
     return;
@@ -116,7 +116,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     m_oldBitmap = (WXHBITMAP) bm;
 }
 
-void wxMemoryDC::GetSize(int *width, int *height) const
+void wxMemoryDC::DoGetSize(int *width, int *height) const
 {
   if (!m_selectedBitmap.Ok())
   {