Fix to MDI to restore 3D border; kludge to OGL Studio sample to redraw

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index f0e07174d5c8785230c186515b3aff85ad3d2058..33651b712f76ef4b32711285ca26e0f5dd74a87a 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -656,20 +656,29 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         wxLogLastError("CreateCompatibleDC");
     }
 
         wxLogLastError("CreateCompatibleDC");
     }
 

-    if ( !::SelectObject(srcDC, GetHbitmapOf(bitmap)) )
+    bool ok = TRUE;
+
+    HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
+    if ( !hbmpSrcOld )

     {
         wxLogLastError("SelectObject");
     {
         wxLogLastError("SelectObject");

+
+        ok = FALSE;

     }
     }

-    if ( !::SelectObject(destDC, (HBITMAP)m_maskBitmap) )
+
+    HGDIOBJ hbmpDstOld = ::SelectObject(destDC, (HBITMAP)m_maskBitmap);
+    if ( !hbmpDstOld )

     {
         wxLogLastError("SelectObject");
     {
         wxLogLastError("SelectObject");

+
+        ok = FALSE;

     }
 
     // this is not very efficient, but I can't think of a better way of doing
     // it
     }
 
     // this is not very efficient, but I can't think of a better way of doing
     // it

-    for ( int w = 0; w < width; w++ )
+    for ( int w = 0; ok && (w < width); w++ )

     {
     {

-        for ( int h = 0; h < height; h++ )
+        for ( int h = 0; ok && (h < height); h++ )

         {
             COLORREF col = GetPixel(srcDC, w, h);
             if ( col == CLR_INVALID )
         {
             COLORREF col = GetPixel(srcDC, w, h);
             if ( col == CLR_INVALID )


@@ -677,12 +686,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
                 wxLogLastError("GetPixel");
 
                 // doesn't make sense to continue
                 wxLogLastError("GetPixel");
 
                 // doesn't make sense to continue

-                ::SelectObject(srcDC, 0);
-                ::DeleteDC(srcDC);
-                ::SelectObject(destDC, 0);
-                ::DeleteDC(destDC);
+                ok = FALSE;

 
 

-                return FALSE;
+                break;

             }
 
             if ( col == maskColour )
             }
 
             if ( col == maskColour )


@@ -696,12 +702,12 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         }
     }
 
         }
     }
 

-    ::SelectObject(srcDC, 0);
+    ::SelectObject(srcDC, hbmpSrcOld);

     ::DeleteDC(srcDC);
     ::DeleteDC(srcDC);

-    ::SelectObject(destDC, 0);
+    ::SelectObject(destDC, hbmpDstOld);

     ::DeleteDC(destDC);
 
     ::DeleteDC(destDC);
 

-    return TRUE;
+    return ok;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------