fixed DLL linking of wxConvLibc etc.

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

diff --git a/wxPython/wx/lib/splitter.py b/wxPython/wx/lib/splitter.py
index a0d7bfb0f754d4b074be41a44214cdf35e0335cd..c5e2e85f55cc16eaee1a4c3c31cf779eae7cd3c9 100644 (file)
--- a/wxPython/wx/lib/splitter.py
+++ b/wxPython/wx/lib/splitter.py
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------
 # Name:        wx.lib.splitter
 # Purpose:     A class similar to wx.SplitterWindow but that allows more
 #----------------------------------------------------------------------
 # Name:        wx.lib.splitter
 # Purpose:     A class similar to wx.SplitterWindow but that allows more

-#              a single split
+#              than a single split

 #
 # Author:      Robin Dunn
 #
 #
 # Author:      Robin Dunn
 #


@@ -17,7 +17,6 @@ more than once.
 """
 
 import wx
 """
 
 import wx

-import sys

 
 _RENDER_VER = (2,6,1,1)
 
 
 _RENDER_VER = (2,6,1,1)
 


@@ -29,7 +28,7 @@ class MultiSplitterWindow(wx.PyPanel):
     allows for more than two windows and more than one sash.  Many of
     the same styles, constants, and methods behave the same as in
     wx.SplitterWindow.  The key differences are seen in the methods
     allows for more than two windows and more than one sash.  Many of
     the same styles, constants, and methods behave the same as in
     wx.SplitterWindow.  The key differences are seen in the methods

-    that deal with the child windows manage by the splitter, and also
+    that deal with the child windows managed by the splitter, and also

     those that deal with the sash positions.  In most cases you will
     need to pass an index value to tell the class which window or sash
     you are refering to.
     those that deal with the sash positions.  In most cases you will
     need to pass an index value to tell the class which window or sash
     you are refering to.


@@ -38,7 +37,7 @@ class MultiSplitterWindow(wx.PyPanel):
     wx.SplitterWindow.  Since the wx.Splitterwindow has only one sash
     you can think of it's position as either relative to the whole
     splitter window, or as relative to the first window pane managed
     wx.SplitterWindow.  Since the wx.Splitterwindow has only one sash
     you can think of it's position as either relative to the whole
     splitter window, or as relative to the first window pane managed

-    by the splitter.  Once there are more than one sash then the
+    by the splitter.  Once there is more than one sash then the

     distinciton between the two concepts needs to be clairified.  I've
     chosen to use the second definition, and sash positions are the
     distance (either horizontally or vertically) from the origin of
     distinciton between the two concepts needs to be clairified.  I've
     chosen to use the second definition, and sash positions are the
     distance (either horizontally or vertically) from the origin of


@@ -130,13 +129,17 @@ class MultiSplitterWindow(wx.PyPanel):
 
     def AppendWindow(self, window, sashPos=-1):
         """
 
     def AppendWindow(self, window, sashPos=-1):
         """

-        Add a new window to the splitter.  If sashPos is given then it is the 
+        Add a new window to the splitter at the right side or bottom
+        of the window stack.  If sashPos is given then it is used to
+        size the new window.

         """
         """

-        self.InsertWindow(sys.maxint, window, sashPos)
+        self.InsertWindow(len(self._windows), window, sashPos)

 
 
     def InsertWindow(self, idx, window, sashPos=-1):
         """
 
 
     def InsertWindow(self, idx, window, sashPos=-1):
         """

+        Insert a new window into the splitter at the position given in
+        ``idx``.

         """
         assert window not in self._windows, "A window can only be in the splitter once!"
         self._windows.insert(idx, window)
         """
         assert window not in self._windows, "A window can only be in the splitter once!"
         self._windows.insert(idx, window)


@@ -206,6 +209,16 @@ class MultiSplitterWindow(wx.PyPanel):
         return self._sashes[idx]
 
 
         return self._sashes[idx]
 
 

+    def SetSashPosition(self, idx, pos):
+        """
+        Set the psition of the idx'th sash, measured from the left/top
+        of the window preceding the sash.
+        """
+        assert idx < len(self._sashes)
+        self._sashes[idx] = pos
+        self._SizeWindows()
+        
+

     def SizeWindows(self):
         """
         Reposition and size the windows managed by the splitter.
     def SizeWindows(self):
         """
         Reposition and size the windows managed by the splitter.


@@ -227,14 +240,14 @@ class MultiSplitterWindow(wx.PyPanel):
         sashsize = self._GetSashSize()
         if self._orient == wx.HORIZONTAL:
             for win in self._windows:
         sashsize = self._GetSashSize()
         if self._orient == wx.HORIZONTAL:
             for win in self._windows:

-                winbest = win.GetAdjustedBestSize()
+                winbest = win.GetEffectiveMinSize()

                 best.width += max(self._minimumPaneSize, winbest.width)
                 best.height = max(best.height, winbest.height)
             best.width += sashsize * (len(self._windows)-1)
 
         else:
             for win in self._windows:
                 best.width += max(self._minimumPaneSize, winbest.width)
                 best.height = max(best.height, winbest.height)
             best.width += sashsize * (len(self._windows)-1)
 
         else:
             for win in self._windows:

-                winbest = win.GetAdjustedBestSize()
+                winbest = win.GetEffectiveMinSize()

                 best.height += max(self._minimumPaneSize, winbest.height)
                 best.width = max(best.width, winbest.width)
             best.height += sashsize * (len(self._windows)-1)
                 best.height += max(self._minimumPaneSize, winbest.height)
                 best.width = max(best.width, winbest.width)
             best.height += sashsize * (len(self._windows)-1)


@@ -689,8 +702,7 @@ class MultiSplitterWindow(wx.PyPanel):
                                            cw - 2*border, ch - 2*border)
         else:
             if 'wxMSW' in wx.PlatformInfo:
                                            cw - 2*border, ch - 2*border)
         else:
             if 'wxMSW' in wx.PlatformInfo:

-                for win in self._windows:
-                    win.Freeze()
+                self.Freeze()

             if self._orient == wx.HORIZONTAL:
                 x = y = border
                 h = ch - 2*border
             if self._orient == wx.HORIZONTAL:
                 x = y = border
                 h = ch - 2*border


@@ -714,8 +726,7 @@ class MultiSplitterWindow(wx.PyPanel):
                 if last > 0:
                     self._sashes[idx+1] = last
             if 'wxMSW' in wx.PlatformInfo:
                 if last > 0:
                     self._sashes[idx+1] = last
             if 'wxMSW' in wx.PlatformInfo:

-                for win in self._windows:
-                    win.Thaw()
+                self.Thaw()

                 
         self._DrawSash(wx.ClientDC(self))
         self._needUpdating = False
                 
         self._DrawSash(wx.ClientDC(self))
         self._needUpdating = False


@@ -768,62 +779,3 @@ class MultiSplitterEvent(wx.PyCommandEvent):
 
 
 
 
 
 

-
-if __name__ == "__main__":
-
-    def OnChanged(evt):
-        print "Changed:", evt.GetSashIdx(), evt.GetSashPosition()
-    def OnChanging(evt):
-        print "Changing:", evt.GetSashIdx(), evt.GetSashPosition()
-        
-    
-    app = wx.App(0)
-    frm = wx.Frame(None, title="tester", size=(640,480))
-
-    #frm.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, OnChanged)
-    #frm.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGING, OnChanging)
-
-    #sty = 0
-    #sty = wx.SP_3DBORDER
-    #sty = wx.SP_NOSASH
-    sty = wx.SP_LIVE_UPDATE
-
-    splitter = MultiSplitterWindow(frm, style=sty)
-    #splitter.SetOrientation(wx.VERTICAL)
-    splitter.SetMinimumPaneSize(25)
-
-    #sty = wx.BORDER_NONE
-    #sty = wx.BORDER_SIMPLE
-    sty = wx.BORDER_SUNKEN
-    
-    p1 = wx.Window(splitter, style=sty)
-    p1.SetBackgroundColour("pink")
-    wx.StaticText(p1, -1, "Panel One", (5,5))
-
-    p2 = wx.Window(splitter, style=sty)
-    p2.SetBackgroundColour("sky blue")
-    wx.StaticText(p2, -1, "Panel Two", (5,5))
-    p2.SetMinSize((50,50))
-    
-    p3 = wx.Window(splitter, style=sty)
-    p3.SetBackgroundColour("yellow")
-    wx.StaticText(p3, -1, "Panel Three", (5,5))
-
-    splitter.AppendWindow(p1, 100)
-    splitter.AppendWindow(p2, 200)
-    splitter.AppendWindow(p3)
-
-    for x in range(3):
-        p = wx.Window(splitter, style=sty)
-        p.SetBackgroundColour("white")
-        wx.StaticText(p, -1, str(4+x), (5,5))
-        splitter.AppendWindow(p, 50)
-
-    #sizer = wx.BoxSizer()
-    #sizer.Add(splitter, 1, wx.EXPAND)
-    #frm.SetSizerAndFit(sizer)
-
-    frm.Show()
-    app.MainLoop()
-
-