wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it

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

diff --git a/src/univ/statbmp.cpp b/src/univ/statbmp.cpp
index 6177e7065b09522abbd347f0f77022928b6dec8a..6059a8ab2e195ce4a8a4a18ae1f6d18e470d2f7c 100644 (file)
--- a/src/univ/statbmp.cpp
+++ b/src/univ/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/statbmp.cpp
+// Name:        src/univ/statbmp.cpp
 // Purpose:     wxStaticBitmap implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -25,10 +25,11 @@
 
 #if wxUSE_STATBMP
 
+#include "wx/statbmp.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/icon.h"
-    #include "wx/statbmp.h"
     #include "wx/validate.h"
 #endif
 
@@ -60,7 +61,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     SetBitmap(label);
 
     // and adjust our size to fit it after this
-    SetBestSize(size);
+    SetInitialSize(size);
 
     return true;
 }
@@ -105,4 +106,3 @@ void wxStaticBitmap::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_STATBMP
-