X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af498247c5ea024a781d0ef8d30cbbfb44749641..97786ab70f8ee33532b83af6fadad4129e1570e1:/src/msw/statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index b437dcf26a..fd6c408d2e 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -56,7 +56,7 @@ wxBEGIN_FLAGS( wxStaticBitmapStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
-    
+
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
@@ -93,8 +93,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 #endif
 
 /*
-	TODO PROPERTIES :
-		bitmap
+    TODO PROPERTIES :
+        bitmap
 */
 
 // ===========================================================================
@@ -146,15 +146,14 @@ bool wxStaticBitmap::Create(wxWindow *parent,
                             const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     // we may have either bitmap or icon: if a bitmap with mask is passed, we
     // will transform it to an icon ourselves because otherwise the mask will
     // be ignored by Windows
-    wxGDIImage *image = (wxGDIImage *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
 
-    image = ConvertImage( bitmap );
+    wxGDIImage *image = ConvertImage( bitmap );
     m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
 
     // create the native control
@@ -169,8 +168,8 @@ bool wxStaticBitmap::Create(wxWindow *parent,
 
     // GetBestSize will work properly now, so set the best size if needed
     SetBestSize(size);
-    
-    return TRUE;
+
+    return true;
 }
 
 wxBorder wxStaticBitmap::GetDefaultBorder() const
@@ -217,6 +216,7 @@ void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );
+    InvalidateBestSize();
 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
@@ -259,7 +259,7 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
     rect.top    = y;
     rect.right  = x + w;
     rect.bottom = y + h;
-    InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
+    ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);
 }
 
 // We need this or the control can never be moved e.g. in Dialog Editor.