Applied patch [ 1281902 ] fix for wxJoystick under Linux

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

diff --git a/wxPython/wx/lib/scrolledpanel.py b/wxPython/wx/lib/scrolledpanel.py
index 006cbc87339f415fe832eede13d84f5d395d4593..3b134234cf377f3d3dd82fcd1f2c0be3fde8c200 100644 (file)
--- a/wxPython/wx/lib/scrolledpanel.py
+++ b/wxPython/wx/lib/scrolledpanel.py
@@ -35,10 +35,10 @@ class ScrolledPanel( wx.PyScrolledWindow ):
                  size = wx.DefaultSize, style = wx.TAB_TRAVERSAL,
                  name = "scrolledpanel"):
 
-        wx.PyScrolledWindow.__init__(self, parent, -1,
+        wx.PyScrolledWindow.__init__(self, parent, id,
                                      pos=pos, size=size,
                                      style=style, name=name)
-        self.SetBestSize(size)
+        self.SetBestFittingSize(size)
         self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus)