More image processing updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 22:27:10 +00:00
parent d84afea9d1
commit 1c9a789ed9
3 changed files with 129 additions and 27 deletions
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -146,9 +146,14 @@ void wxMemoryDC::SelectObject(
                 (rBitmap.GetSelectedInto() == this),
                 wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );

+    WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();
+
+    if (!hBmp)
+    {
+        m_vSelectedBitmap.SetSelectedInto(NULL);
+    }
    m_vSelectedBitmap = rBitmap;

-    WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();

    if (!hBmp)
    {