X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4715d08bf50050ae00df367d0c95666ca22d088..b736d59eb531794e6b1cef2b4997c517569ff0dd:/src/generic/statbmpg.cpp diff --git a/src/generic/statbmpg.cpp b/src/generic/statbmpg.cpp index 9927e10606..a21ef57e0b 100644 --- a/src/generic/statbmpg.cpp +++ b/src/generic/statbmpg.cpp @@ -3,7 +3,6 @@ // Purpose: wxGenericStaticBitmap // Author: Marcin Wojdyr, Stefan Csomor // Created: 2008-06-16 -// RCS-ID: $Id$ // Copyright: wxWidgets developers // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -18,8 +17,6 @@ #include "wx/generic/statbmpg.h" -IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase) - bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, @@ -36,10 +33,16 @@ bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id, void wxGenericStaticBitmap::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); - PrepareDC(dc); - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) dc.DrawBitmap(m_bitmap, 0, 0, true); } +// under OSX_cocoa is a define, avoid duplicate info +#ifndef wxGenericStaticBitmap + +IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase) + +#endif + #endif // wxUSE_STATBMP