diff --git a/demo/GridBagSizer.py b/demo/GridBagSizer.py index 9e4fbd20..dbfde8b6 100644 --- a/demo/GridBagSizer.py +++ b/demo/GridBagSizer.py @@ -95,18 +95,19 @@ class TestFrame(wx.Frame): self.gbs.SetItemPosition(btn, self.lastPos) btn.SetLabel("Move this to (3,6)") else: - if self.gbs.CheckForIntersectionPos( (3,6), (1,1) ): + if self.gbs.CheckForIntersection( (3,6), (1,1) ): wx.MessageBox("""\ -wx.GridBagSizer will not allow items to be in the same cell as -another item, so this operation will fail. You will also get an -assert when compiled in debug mode.""", +wx.GridBagSizer will not allow items to be in the +same cell as another item, so this operation will +fail. You will also get an assert when compiled +in debug mode.""", "Warning", wx.OK | wx.ICON_INFORMATION) try: if self.gbs.SetItemPosition(btn, (3,6)): self.lastPos = curPos btn.SetLabel("Move it back") - except wx.PyAssertionError: + except wx.wxAssertionError: pass self.gbs.Layout() diff --git a/etg/gbsizer.py b/etg/gbsizer.py index 4c596248..6f71fa88 100644 --- a/etg/gbsizer.py +++ b/etg/gbsizer.py @@ -149,7 +149,9 @@ def run(): func.find('userData').type = 'wxPyUserData*' if func.findItem('item'): func.find('item').transfer = True - + + c.addPyCode( + "GridBagSizer.CheckForIntersectionPos = wx.deprecated(GridBagSizer.CheckForIntersection, 'Use CheckForIntersection instead.')") # TODO: In Classic we had GetChildren return a list of wxGBSizerItems (in # a faked out way). Figure out how to do that here too....