X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed4b0fdca60e017afe72c55940799ce0fed925f0..5eed855656b3996f4c0aa0a585a4820a2af6d628:/src/os2/statbmp.cpp diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index dd3aff2163..5874763573 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -28,8 +28,6 @@ // macros // --------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) - BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow) EVT_PAINT(wxStaticBitmap::OnPaint) END_EVENT_TABLE() @@ -43,7 +41,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 +139,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