Patch 1678304

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

diff --git a/wxPython/wx/lib/rcsizer.py b/wxPython/wx/lib/rcsizer.py
index a95485b51f310121caf18c983b82cc9c38a17de4..b262aee4bd8f5dbe968bd9a99f3430205e92283b 100644 (file)
--- a/wxPython/wx/lib/rcsizer.py
+++ b/wxPython/wx/lib/rcsizer.py
@@ -14,10 +14,14 @@
 # o 2.5 compatability update.
 # o There appears to be a prob with the wx.PySizer.GetSize() method.
 #
 # o 2.5 compatability update.
 # o There appears to be a prob with the wx.PySizer.GetSize() method.
 #

+# 12/23/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wx.PySizer.GetSize() method working right now.
+#

 
 """
 
 """

-A pure-Python wxSizer that lays out items in a grid similar to
-wxFlexGridSizer but item position is not implicit but explicitly
+A pure-Python Sizer that lays out items in a grid similar to
+wx.FlexGridSizer but item position is not implicit but explicitly

 specified by row and col, and row/col spanning is supported.
 
 Adapted from code by Niki Spahiev.
 specified by row and col, and row/col spanning is supported.
 
 Adapted from code by Niki Spahiev.


@@ -71,9 +75,11 @@ class RowColSizer(wx.PySizer):
 
     #--------------------------------------------------
     def Add(self, item, option=0, flag=0, border=0,
 
     #--------------------------------------------------
     def Add(self, item, option=0, flag=0, border=0,

-            row=-1, col=-1,       # row, col and spanning can be specified individually...
+            # row, col and spanning can be specified individually...
+            row=-1, col=-1,       

             rowspan=1, colspan=1,
             rowspan=1, colspan=1,

-            pos=None, size=None,  # or as tuples (row,col) and (rowspan,colspan)
+            # or as tuples (row,col) and (rowspan,colspan)
+            pos=None, size=None,  

             ):
 
         if pos is not None:
             ):
 
         if pos is not None:


@@ -88,8 +94,8 @@ class RowColSizer(wx.PySizer):
         #if rowspan > 1 or colspan > 1:
         #    flag = flag | wx.EXPAND
 
         #if rowspan > 1 or colspan > 1:
         #    flag = flag | wx.EXPAND
 

-        wx.PySizer.Add(self, item, option, flag, border,
-                      userData=(row, col, row+rowspan, col+colspan))
+        return wx.PySizer.Add(self, item, option, flag, border,
+                              userData=(row, col, row+rowspan, col+colspan))

 
     #AddWindow = Add
     #AddSizer  = Add
 
     #AddWindow = Add
     #AddSizer  = Add


@@ -107,8 +113,8 @@ class RowColSizer(wx.PySizer):
         assert row != -1, "Row must be specified"
         assert col != -1, "Column must be specified"
 
         assert row != -1, "Row must be specified"
         assert col != -1, "Column must be specified"
 

-        wx.PySizer.AddSpacer(self, (width, height), option, flag, border,
-                            userData=(row, col, row+rowspan, col+colspan))
+        return wx.PySizer.Add(self, (width, height), option, flag, border,
+                              userData=(row, col, row+rowspan, col+colspan))

 
     #--------------------------------------------------
     def _add( self, size, dim ):
 
     #--------------------------------------------------
     def _add( self, size, dim ):