]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/ScrolledPanel.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Corrected _setCallbackInfo code so GiveFeedback can work
[wxWidgets.git] / wxPython / demo / ScrolledPanel.py
diff --git a/wxPython/demo/ScrolledPanel.py b/wxPython/demo/ScrolledPanel.py
index 2ff349b8f39e5bc041107ab667140d675fa05b6f..a22c3dc9f2c6997904fd5a01849d34a82e3ac906 100644 (file)
--- a/wxPython/demo/ScrolledPanel.py
+++ b/wxPython/demo/ScrolledPanel.py
@@ -1,81 +1,100 @@
 
 
-from wxPython.wx import *
+import  wx
+import  wx.lib.scrolledpanel as scrolled
 
 #----------------------------------------------------------------------
 
 text = "one two buckle my shoe three four shut the door five six pick up sticks seven eight lay them straight nine ten big fat hen"
 
 
 
 #----------------------------------------------------------------------
 
 text = "one two buckle my shoe three four shut the door five six pick up sticks seven eight lay them straight nine ten big fat hen"
 
 
-class ScrolledPanel(wxScrolledWindow):
+class TestPanel(scrolled.ScrolledPanel):
     def __init__(self, parent, log):
         self.log = log
     def __init__(self, parent, log):
         self.log = log
-        wxScrolledWindow.__init__(self, parent, -1,
-                                  style = wxTAB_TRAVERSAL)
-
-        box = wxBoxSizer(wxVERTICAL)
-        box.Add(wxStaticText(self, -1,
-                             "This sample shows how to make a scrollable data entry \n"
-                             "form by using a wxSizer in a wxScrolledWindow."),
-                0, wxCENTER|wxALL, 5)
-        box.Add(wxStaticLine(self, -1), 0, wxEXPAND|wxALL, 5)
-
-        fgs = wxFlexGridSizer(cols=2, vgap=4, hgap=4)
-        fgs.AddGrowableCol(1)
-
-        # Add some spacers
-        fgs.Add(75, 10)
-        fgs.Add(150, 10)
-
-        for word in text.split():
-            label = wxStaticText(self, -1, word+":")
-            tc = wxTextCtrl(self, -1, word)
-            fgs.Add(label, flag=wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL)
-            fgs.Add(tc, flag=wxEXPAND)
-
-        box.Add(fgs, 1)
-        box.Add(10, 40)  # some more empty space at the bottom
-        self.SetSizer(box)
-
-
-        # The following is all that is needed to integrate the sizer and the
-        # scrolled window.  In this case we will only support vertical scrolling.
-        self.EnableScrolling(false, true)
-        self.SetScrollRate(0, 20)
-        box.SetVirtualSizeHints(self)
-        EVT_CHILD_FOCUS(self, self.OnChildFocus)
-
-        wxCallAfter(self.Scroll, 0, 0) # scroll back to top after initial events
-
-
-    def OnChildFocus(self, evt):
-        # If the child window that gets the focus is not visible,
-        # this handler will try to scroll enough to see it.  If you
-        # need to handle horizontal auto-scrolling too then this will
-        # need adapted.
-        evt.Skip()
-        child = evt.GetWindow()
-
-        sppu_y = self.GetScrollPixelsPerUnit()[1]
-        vs_y   = self.GetViewStart()[1]
-        cpos = child.GetPosition()
-        csz  = child.GetSize()
-
-        # is it above the top?
-        if cpos.y < 0:
-            new_vs = cpos.y / sppu_y
-            self.Scroll(-1, new_vs)
-
-        # is it below the bottom ?
-        if cpos.y + csz.height > self.GetClientSize().height:
-            diff = (cpos.y + csz.height - self.GetClientSize().height) / sppu_y
-            self.Scroll(-1, vs_y + diff + 1)
+        scrolled.ScrolledPanel.__init__(self, parent, -1)
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        desc = wx.StaticText(self, -1,
+                            "ScrolledPanel extends wx.ScrolledWindow, adding all "
+                            "the necessary bits to set up scroll handling for you.\n\n"
+                            "Here are three fixed size examples of its use. The "
+                            "demo panel for this sample is also using it -- the \nwxStaticLine "
+                            "below is intentionally made too long so a scrollbar will be "
+                            "activated."
+                            )
+        desc.SetForegroundColour("Blue")
+        vbox.Add(desc, 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        vbox.Add(wx.StaticLine(self, -1, size=(1024,-1)), 0, wx.ALL, 5)
+        vbox.Add((20,20))
+
+        words = text.split()
+
+        panel1 = scrolled.ScrolledPanel(self, -1, size=(120,300),
+                                 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER )
+        fgs1 = wx.FlexGridSizer(cols=2, vgap=4, hgap=4)
+
+        for word in words:
+            label = wx.StaticText(panel1, -1, word+":")
+            tc = wx.TextCtrl(panel1, -1, word, size=(50,-1))
+            fgs1.Add(label, flag=wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL)
+            fgs1.Add(tc, flag=wx.EXPAND|wx.RIGHT, border=25)
+
+        panel1.SetSizer( fgs1 )
+        panel1.SetAutoLayout(1)
+        panel1.SetupScrolling( scroll_x=False )
+
+        panel2 = scrolled.ScrolledPanel(self, -1, size=(350, 40),
+                                 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
+        panel3 = scrolled.ScrolledPanel(self, -1, size=(200,100),
+                                 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
+
+        fgs2 = wx.FlexGridSizer(cols=25, vgap=4, hgap=4)
+        fgs3 = wx.FlexGridSizer(cols=5, vgap=4, hgap=4)
+
+        for i in range(len(words)):
+            word = words[i]
+            if i % 5 != 4:
+                label2 = wx.StaticText(panel2, -1, word)
+                fgs2.Add(label2, flag=wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL)
+                label3 = wx.StaticText(panel3, -1, word)
+                fgs3.Add(label3, flag=wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL)
+            else:
+                tc2 = wx.TextCtrl(panel2, -1, word, size=(50,-1))
+                fgs2.Add(tc2, flag=wx.LEFT, border=5)
+                tc3 = wx.TextCtrl(panel3, -1, word )
+                fgs3.Add(tc3, flag=wx.LEFT, border=5)
+
+        panel2.SetSizer( fgs2 )
+        panel2.SetAutoLayout(1)
+        panel2.SetupScrolling(scroll_y = False)
+
+        panel3.SetSizer( fgs3 )
+        panel3.SetAutoLayout(1)
+        panel3.SetupScrolling()
+
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.Add((20,20))
+        hbox.Add(panel1, 0)
+        hbox.Add((40, 10))
+
+        vbox2 = wx.BoxSizer(wx.VERTICAL)
+        vbox2.Add(panel2, 0)
+        vbox2.Add((20, 50))
+
+        vbox2.Add(panel3, 0)
+        vbox2.Add((20, 10))
+        hbox.Add(vbox2)
+
+        vbox.Add(hbox, 0)
+        self.SetSizer(vbox)
+        self.SetAutoLayout(1)
+        self.SetupScrolling()
 
 
 #----------------------------------------------------------------------
 
 
 def runTest(frame, nb, log):
 
 
 #----------------------------------------------------------------------
 
 
 def runTest(frame, nb, log):
-    win = ScrolledPanel(nb, log)
+    win = TestPanel(nb, log)
     return win
 
 #----------------------------------------------------------------------
     return win
 
 #----------------------------------------------------------------------
@@ -83,15 +102,14 @@ def runTest(frame, nb, log):
 
 
 overview = """<html><body>
 
 
 overview = """<html><body>
-This sample shows how to make a scrollable data entry form by
-using a wxSizer in a wxScrolledWindow.
+ScrolledPanel fills a "hole" in the implementation of wx.ScrolledWindow,
+providing automatic scrollbar and scrolling behavior and the tab traversal
+mangement that wx.ScrolledWindow lacks.
 </body></html>
 """
 
 
 </body></html>
 """
 
 
-
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
-
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
wxWidgets (Impactor)