patches for BC++ 5.3 from Ricky Gonzales <gonzales@pyramid3.net>

[wxWidgets.git] / src / msw / statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index e37a780841966d6a94a6548e0e4dcaa52f8b89e1..da32aead681f8571f625018d05bed2823bf6dc2a 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -42,9 +42,7 @@
 // macors
 // ---------------------------------------------------------------------------
 
 // macors
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

-#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -187,7 +185,9 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
 {
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 

-    wxBitmap* bitmap = m_image.bitmap;
+    wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") );
+
+    wxBitmap* bitmap = (wxBitmap *)m_image;

     if ( !bitmap->Ok() )
         return FALSE;
 
     if ( !bitmap->Ok() )
         return FALSE;