test for special keys first, before testing for alphanumeric ones as even keys such...

[wxWidgets.git] / wxPython / src / _gbsizer.i

diff --git a/wxPython/src/_gbsizer.i b/wxPython/src/_gbsizer.i
index 412ad058e5c24615bb6bd316b817581eae611436..c100893129f867b10fbb4d2823da38cdf7e58170 100644 (file)
--- a/wxPython/src/_gbsizer.i
+++ b/wxPython/src/_gbsizer.i
@@ -393,6 +393,10 @@ is successful and after the next Layout() the item will be resized.
         void , SetGBSizer(wxGridBagSizer* sizer),
         "Set the sizer this item is a member of.", "");   
     
+    %property(EndPos, GetEndPos, doc="See `GetEndPos`");
+    %property(GBSizer, GetGBSizer, SetGBSizer, doc="See `GetGBSizer` and `SetGBSizer`");
+    %property(Pos, GetPos, SetPos, doc="See `GetPos` and `SetPos`");
+    %property(Span, GetSpan, SetSpan, doc="See `GetSpan` and `SetSpan`");
 };
 
 
@@ -550,7 +554,17 @@ Find the sizer item for the given window or subsizer, returns None if
 not found. (non-recursive)", "");
     wxGBSizerItem* FindItem(wxWindow* window);
     wxGBSizerItem* FindItem(wxSizer* sizer);
-
+    %pythoncode {
+        def GetItem(self, item):
+            gbsi = None
+            si = wx.FlexGridSizer.GetItem(self, item)
+            if not si:
+                return None
+            if type(item) is not int:
+                gbsi = self.FindItem(item)
+            if gbsi: return gbsi
+            return si
+    }
     
     DocDeclStr(
         wxGBSizerItem* , FindItemAtPosition(const wxGBPosition& pos),
@@ -599,7 +613,6 @@ for intersection, for example it may be the item we are checking the
 position of.", "",
         CheckForIntersectionPos);
     
-
 };