X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66e23ad2081689dad6e829b9667cdbc93ac45154..606b005fb2b535b34d1ca45d2d06ee86718e8b1c:/src/msw/bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 79b21b8e87..437a6c4452 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -294,9 +294,6 @@ bool wxBitmap::CreateFromXpm(const char **data)
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
     
     *this = wxBitmap(img);
-    
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-
     return TRUE;
 #else
 	return FALSE;
@@ -1042,6 +1039,10 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     bool ok = TRUE;
 
+    // SelectObject() will fail
+    wxASSERT_MSG( !bitmap.GetSelectedInto(),
+                  _T("bitmap can't be selected in another DC") );
+
     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )
     {