X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdccdfabb29bd51aded9aac141e1f7bbd6c85443..63ced01b228ba426db163b75667a9b57d092f8db:/src/os2/statbmp.cpp?ds=sidebyside diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 3ec5c73c58..c80642962f 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -17,9 +17,9 @@ #ifndef WX_PRECOMP #include "wx/icon.h" #include "wx/window.h" + #include "wx/dcclient.h" #endif -#include "wx/dcclient.h" #include "wx/os2/private.h" #include @@ -43,7 +43,7 @@ static wxGDIImage* ConvertImage( if(!bIsIcon ) { wxASSERT_MSG( wxDynamicCast(&rBitmap, wxBitmap), - _T("not an icon and not a bitmap?") ); + wxT("not an icon and not a bitmap?") ); const wxBitmap& rBmp = (const wxBitmap&)rBitmap; wxMask* pMask = rBmp.GetMask(); @@ -141,9 +141,7 @@ bool wxStaticBitmap::ImageIsOk() const void wxStaticBitmap::Free() { - if (m_pImage) - delete m_pImage; - m_pImage = NULL; + wxDELETE(m_pImage); } // end of wxStaticBitmap::Free wxSize wxStaticBitmap::DoGetBestSize() const