1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index dd76ffcd3acbca5546bf0c4b2e6645f9704deee8..1a4b151391e87a24b898efa735c022f60b5710e3 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -27,6 +27,7 @@
 #include "wx/dcmemory.h"
 
 #include <windows.h>
+#include "wx/msw/winundef.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
@@ -81,7 +82,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
   // a device context
   if (bitmap.GetSelectedInto() && (bitmap.GetSelectedInto() != this))
   {
-    wxFatalError("Error in wxMemoryDC::SelectObject\nBitmap is selected in another wxMemoryDC.\nDelete the first wxMemoryDC or use SelectObject(NULL)");
+    wxFatalError(_T("Error in wxMemoryDC::SelectObject\nBitmap is selected in another wxMemoryDC.\nDelete the first wxMemoryDC or use SelectObject(NULL)"));
     return;
   }
 
@@ -90,17 +91,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;
@@ -110,13 +111,13 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 
   if (bm == ERROR)
   {
-    wxFatalError("Error in wxMemoryDC::SelectObject\nBitmap may not be loaded, or may be selected in another wxMemoryDC.\nDelete the first wxMemoryDC to deselect bitmap.");
+    wxFatalError(_T("Error in wxMemoryDC::SelectObject\nBitmap may not be loaded, or may be selected in another wxMemoryDC.\nDelete the first wxMemoryDC to deselect bitmap."));
   }
   else if (!m_oldBitmap)
     m_oldBitmap = (WXHBITMAP) bm;
 }
 
-void wxMemoryDC::GetSize(int *width, int *height) const
+void wxMemoryDC::DoGetSize(int *width, int *height) const
 {
   if (!m_selectedBitmap.Ok())
   {