fixed wxToolBar::DeleteTool and losing the rows number on sys colour change

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

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index a5f196584eaf365b4a78f4841a78d212ff8f3403..cb5a8a8abcd9a32c4e9d6e9e2b325f2e1813cbb2 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -102,8 +102,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
     // check for whether the bitmap is already selected into a device context
     wxCHECK_RET( !bitmap.GetSelectedInto() ||
                  (bitmap.GetSelectedInto() == this),
     // check for whether the bitmap is already selected into a device context
     wxCHECK_RET( !bitmap.GetSelectedInto() ||
                  (bitmap.GetSelectedInto() == this),

-                 wxT("Bitmap is selected in another wxMemoryDC, delete the "
-                     "first wxMemoryDC or use SelectObject(NULL)") );
+                 wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );

 
     m_selectedBitmap = bitmap;
     WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP();
 
     m_selectedBitmap = bitmap;
     WXHBITMAP hBmp = m_selectedBitmap.GetHBITMAP();


@@ -115,7 +114,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
 
     if ( !hBmp )
     {
 
     if ( !hBmp )
     {

-        wxLogLastError("SelectObject(memDC, bitmap)");
+        wxLogLastError(wxT("SelectObject(memDC, bitmap)"));

 
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }
 
         wxFAIL_MSG(wxT("Couldn't select a bitmap into wxMemoryDC"));
     }