fixed child windows scrolling to use wxSIZE_ALLOW_MINUS_ONE

[wxWidgets.git] / wxPython / wx / lib / statbmp.py

diff --git a/wxPython/wx/lib/statbmp.py b/wxPython/wx/lib/statbmp.py
index 54dd9cc6963036c1053f13bd51cc488daa266254..3585446ee62322beceb4fee0c05e90043f546166 100644 (file)
--- a/wxPython/wx/lib/statbmp.py
+++ b/wxPython/wx/lib/statbmp.py
@@ -27,7 +27,7 @@ class GenStaticBitmap(wx.PyControl):
                              wx.DefaultValidator, name)
         self._bitmap = bitmap
         self.InheritAttributes()
-        self.SetBestFittingSize(size)
+        self.SetInitialSize(size)
 
         self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
         self.Bind(wx.EVT_PAINT,            self.OnPaint)
@@ -35,7 +35,7 @@ class GenStaticBitmap(wx.PyControl):
 
     def SetBitmap(self, bitmap):
         self._bitmap = bitmap
-        self.SetBestFittingSize( (bitmap.GetWidth(), bitmap.GetHeight()) )
+        self.SetInitialSize( (bitmap.GetWidth(), bitmap.GetHeight()) )
         self.Refresh()
 
 
@@ -74,7 +74,8 @@ class GenStaticBitmap(wx.PyControl):
 
     def OnPaint(self, event):
         dc = wx.PaintDC(self)
-        dc.DrawBitmap(self._bitmap, 0, 0, True)
+        if self._bitmap:
+            dc.DrawBitmap(self._bitmap, 0, 0, True)
         
 
     def OnEraseBackground(self, event):