in unescape add normal characters in addition to unescaped characters :)

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

diff --git a/wxPython/wx/lib/scrolledpanel.py b/wxPython/wx/lib/scrolledpanel.py
index c716647b1f599cdc19bad3ff8dbed37be33363ee..851d9332fa9a075dd7e32466f680e7c1f07af3a5 100644 (file)
--- a/wxPython/wx/lib/scrolledpanel.py
+++ b/wxPython/wx/lib/scrolledpanel.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------

-# Name:         wxScrolledPanel.py
+# Name:         scrolledpanel.py

 # Author:       Will Sadkin
 # Created:      03/21/2003
 # Copyright:    (c) 2003 by Will Sadkin
 # Author:       Will Sadkin
 # Created:      03/21/2003
 # Copyright:    (c) 2003 by Will Sadkin


@@ -10,26 +10,35 @@
 #
 # o 2.5 compatability update.
 #
 #
 # o 2.5 compatability update.
 #

+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxScrolledPanel -> ScrolledPanel
+#

 
 import  wx
 
 
 
 import  wx
 
 

-class wxScrolledPanel( wx.ScrolledWindow ):
-    """\
-wxScrolledPanel fills a "hole" in the implementation of wxScrolledWindow,
-providing automatic scrollbar and scrolling behavior and the tab traversal
-management that wxScrolledWindow lacks.  This code was based on the original
-demo code showing how to do this, but is now available for general use
-as a proper class (and the demo is now converted to just use it.)
-"""
-    def __init__(self, parent, id=-1,
-                 pos = wx.DefaultPosition, size = wx.DefaultSize,
-                 style = wx.TAB_TRAVERSAL, name = "scrolledpanel"):
+class ScrolledPanel( wx.PyScrolledWindow ):

 
 

-        wx.ScrolledWindow.__init__(self, parent, -1,
-                                  pos=pos, size=size,
-                                  style=style, name=name)
+    """ ScrolledPanel fills a "hole" in the implementation of
+    wx.ScrolledWindow, providing automatic scrollbar and scrolling
+    behavior and the tab traversal management that wxScrolledWindow
+    lacks.  This code was based on the original demo code showing how
+    to do this, but is now available for general use as a proper class
+    (and the demo is now converted to just use it.)

 
 

+    It is assumed that the ScrolledPanel will have a sizer, as it is
+    used to calculate the minimal virtual size of the panel and etc.
+    """
+    
+    def __init__(self, parent, id=-1, pos = wx.DefaultPosition,
+                 size = wx.DefaultSize, style = wx.TAB_TRAVERSAL,
+                 name = "scrolledpanel"):
+
+        wx.PyScrolledWindow.__init__(self, parent, -1,
+                                     pos=pos, size=size,
+                                     style=style, name=name)
+        self.SetBestFittingSize(size)

         self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus)
 
 
         self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus)
 
 


@@ -37,7 +46,7 @@ as a proper class (and the demo is now converted to just use it.)
         """
         This function sets up the event handling necessary to handle
         scrolling properly. It should be called within the __init__
         """
         This function sets up the event handling necessary to handle
         scrolling properly. It should be called within the __init__

-        function of any class that is derived from wxScrolledPanel,
+        function of any class that is derived from ScrolledPanel,

         once the controls on the panel have been constructed and
         thus the size of the scrolling area can be determined.
 
         once the controls on the panel have been constructed and
         thus the size of the scrolling area can be determined.
 


@@ -70,30 +79,41 @@ as a proper class (and the demo is now converted to just use it.)
 
         sppu_x, sppu_y = self.GetScrollPixelsPerUnit()
         vs_x, vs_y   = self.GetViewStart()
 
         sppu_x, sppu_y = self.GetScrollPixelsPerUnit()
         vs_x, vs_y   = self.GetViewStart()

-        cpos = child.GetPosition()
-        csz  = child.GetSize()
+        cr = child.GetRect()
+        clntsz = self.GetClientSize()

         new_vs_x, new_vs_y = -1, -1
 
         # is it before the left edge?
         new_vs_x, new_vs_y = -1, -1
 
         # is it before the left edge?

-        if cpos.x < 0 and sppu_x > 0:
-            new_vs_x = vs_x + (cpos.x / sppu_x)
+        if cr.x < 0 and sppu_x > 0:
+            new_vs_x = vs_x + (cr.x / sppu_x)

 
         # is it above the top?
 
         # is it above the top?

-        if cpos.y < 0 and sppu_y > 0:
-            new_vs_y = vs_y + (cpos.y / sppu_y)
+        if cr.y < 0 and sppu_y > 0:
+            new_vs_y = vs_y + (cr.y / sppu_y)

 
 

-        clntsz = self.GetClientSize()

 
 

-        # is it past the right edge ?
-        if cpos.x + csz.width > clntsz.width and sppu_x > 0:
-            diff = (cpos.x + csz.width - clntsz.width) / sppu_x
-            new_vs_x = vs_x + diff + 1
+        # For the right and bottom edges, scroll enough to show the
+        # whole control if possible, but if not just scroll such that
+        # the top/left edges are still visible

 
 

+        # is it past the right edge ?
+        if cr.right > clntsz.width and sppu_x > 0:
+            diff = (cr.right - clntsz.width) / sppu_x
+            if cr.x - diff * sppu_x > 0:
+                new_vs_x = vs_x + diff + 1
+            else:
+                new_vs_x = vs_x + (cr.x / sppu_x)
+                

         # is it below the bottom ?
         # is it below the bottom ?

-        if cpos.y + csz.height > clntsz.height and sppu_y > 0:
-            diff = (cpos.y + csz.height - clntsz.height) / sppu_y
-            new_vs_y = vs_y + diff + 1
+        if cr.bottom > clntsz.height and sppu_y > 0:
+            diff = (cr.bottom - clntsz.height) / sppu_y
+            if cr.y - diff * sppu_y > 0:
+                new_vs_y = vs_y + diff + 1
+            else:
+                new_vs_y = vs_y + (cr.y / sppu_y)
+

 
         # if we need to adjust
         if new_vs_x != -1 or new_vs_y != -1:
 
         # if we need to adjust
         if new_vs_x != -1 or new_vs_y != -1:

+            #print "%s: (%s, %s)" % (self.GetName(), new_vs_x, new_vs_y)

             self.Scroll(new_vs_x, new_vs_y)
             self.Scroll(new_vs_x, new_vs_y)