MDI child maximize bug fixed

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 60bbb50735c0f9ddee71baed659b8da2870ad71b..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/dcmemory.h"
 
 #include <windows.h>

+#include "wx/msw/winundef.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 #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))
   {
   // 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;
   }
 
     return;
   }
 


@@ -110,7 +111,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 
   if (bm == ERROR)
   {
 
   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;
   }
   else if (!m_oldBitmap)
     m_oldBitmap = (WXHBITMAP) bm;