X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ef4a97bfd291f4535d4f31846251e6510b58795..5f2f8e027e2acc56416aa2c64736e33b3f1174f8:/src/msw/anybutton.cpp diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp index 0e3da82ea3..6251a69c5e 100644 --- a/src/msw/anybutton.cpp +++ b/src/msw/anybutton.cpp @@ -3,7 +3,7 @@ // Purpose: wxAnyButton // Author: Julian Smart // Created: 1998-01-04 (extracted from button.cpp) -// RCS-ID: $Id: anybutton.cpp 67384 2011-04-03 20:31:32Z DS $ +// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -656,7 +656,7 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which) if ( m_imageData && bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() ) { - wxASSERT_MSG( which == State_Normal, + wxASSERT_MSG( (which == State_Normal) || bitmap.IsNull(), "Must set normal bitmap with the new size first" ); #if wxUSE_UXTHEME