Warning fixes and source cleaning.

[wxWidgets.git] / wxPython / demo / RadioButton.py

diff --git a/wxPython/demo/RadioButton.py b/wxPython/demo/RadioButton.py
index 74b853d048fd7288e0b1e90811181ea25e99bd4b..f2205207ebf5beae91dcb12759d53c490a8d2952 100644 (file)
--- a/wxPython/demo/RadioButton.py
+++ b/wxPython/demo/RadioButton.py
@@ -10,6 +10,13 @@ class TestPanel( wx.Panel ):
         self.log = log
         panel = wx.Panel( self, -1 )
 
+        # Layout controls on panel:
+        vs = wx.BoxSizer( wx.VERTICAL )
+
+        box1_title = wx.StaticBox( panel, -1, "Group 1" )
+        box1 = wx.StaticBoxSizer( box1_title, wx.VERTICAL )
+        grid1 = wx.FlexGridSizer( 0, 2, 0, 0 )
+
         # 1st group of controls:
         self.group1_ctrls = []
         radio1 = wx.RadioButton( panel, -1, " Radio1 ", style = wx.RB_GROUP )
@@ -22,6 +29,17 @@ class TestPanel( wx.Panel ):
         self.group1_ctrls.append((radio2, text2))
         self.group1_ctrls.append((radio3, text3))
 
+        for radio, text in self.group1_ctrls:
+            grid1.Add( radio, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
+            grid1.Add( text, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
+
+        box1.Add( grid1, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
+        vs.Add( box1, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
+
+        box2_title = wx.StaticBox( panel, -1, "Group 2" )
+        box2 = wx.StaticBoxSizer( box2_title, wx.VERTICAL )
+        grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
+
         # 2nd group of controls:
         self.group2_ctrls = []
         radio4 = wx.RadioButton( panel, -1, " Radio1 ", style = wx.RB_GROUP )
@@ -33,31 +51,13 @@ class TestPanel( wx.Panel ):
         self.group2_ctrls.append((radio4, text4))
         self.group2_ctrls.append((radio5, text5))
         self.group2_ctrls.append((radio6, text6))
-
-        # Layout controls on panel:
-        vs = wx.BoxSizer( wx.VERTICAL )
-
-        box1_title = wx.StaticBox( panel, -1, "Group 1" )
-        box1 = wx.StaticBoxSizer( box1_title, wx.VERTICAL )
-        grid1 = wx.FlexGridSizer( 0, 2, 0, 0 )
-
-        for radio, text in self.group1_ctrls:
-            grid1.AddWindow( radio, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
-            grid1.AddWindow( text, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
-
-        box1.AddSizer( grid1, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
-        vs.AddSizer( box1, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
-
-        box2_title = wx.StaticBox( panel, -1, "Group 2" )
-        box2 = wx.StaticBoxSizer( box2_title, wx.VERTICAL )
-        grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
-
+        
         for radio, text in self.group2_ctrls:
-            grid2.AddWindow( radio, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
-            grid2.AddWindow( text, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
+            grid2.Add( radio, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
+            grid2.Add( text, 0, wx.ALIGN_CENTRE|wx.LEFT|wx.RIGHT|wx.TOP, 5 )
 
-        box2.AddSizer( grid2, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
-        vs.AddSizer( box2, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
+        box2.Add( grid2, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
+        vs.Add( box2, 0, wx.ALIGN_CENTRE|wx.ALL, 5 )
 
         panel.SetSizer( vs )
         vs.Fit( panel )