X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..521a2cb15495224d42df6116f93049800595a7ba:/wxPython/demo/wxRadioBox.py

diff --git a/wxPython/demo/wxRadioBox.py b/wxPython/demo/wxRadioBox.py
index 0b734d23ff..78921edaa9 100644
--- a/wxPython/demo/wxRadioBox.py
+++ b/wxPython/demo/wxRadioBox.py
@@ -3,6 +3,11 @@ from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
+RBOX1 = wxNewId()
+RBOX2 = wxNewId()
+RBUT1 = wxNewId()
+RBUT2 = wxNewId()
+
 class TestRadioButtons(wxPanel):
     def __init__(self, parent, log):
         self.log = log
@@ -12,23 +17,40 @@ class TestRadioButtons(wxPanel):
         sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
                       'six', 'seven', 'eight']
 
-        rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 30), wxDefaultSize,
-                        sampleList, 3, wxRA_SPECIFY_COLS)
-        EVT_RADIOBOX(self, 30, self.EvtRadioBox)
+        sizer = wxBoxSizer(wxVERTICAL)
+        rb = wxRadioBox(self, RBOX1, "wxRadioBox",
+                        wxDefaultPosition, wxDefaultSize,
+                        sampleList, 2, wxRA_SPECIFY_COLS)
+        EVT_RADIOBOX(self, RBOX1, self.EvtRadioBox)
         #rb.SetBackgroundColour(wxBLUE)
         rb.SetToolTip(wxToolTip("This is a ToolTip!"))
+        #rb.SetLabel("wxRadioBox")
+        sizer.Add(rb, 0, wxALL, 20)
 
-        wxRadioButton(self, 32, "wxRadioButton", (235, 35))
-        wxRadioButton(self, 33, "wxRadioButton", (235, 55))
-
-        rb = wxRadioBox(self, 35, "", wxPoint(35, 120), wxDefaultSize,
+        rb = wxRadioBox(self, RBOX2, "", wxDefaultPosition, wxDefaultSize,
                         sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER)
-        EVT_RADIOBOX(self, 35, self.EvtRadioBox)
+        EVT_RADIOBOX(self, RBOX2, self.EvtRadioBox)
+        rb.SetToolTip(wxToolTip("This box has no label"))
+        sizer.Add(rb, 0, wxLEFT|wxRIGHT|wxBOTTOM, 20)
+
+        sizer.Add(wxStaticText(self, -1, "These are plain wxRadioButtons"),
+                  0, wxLEFT|wxRIGHT, 20)
+        sizer.Add(wxRadioButton(self, RBUT1, "wxRadioButton 1"),
+                  0, wxLEFT|wxRIGHT, 20)
+        sizer.Add(wxRadioButton(self, RBUT2, "wxRadioButton 2"),
+                  0, wxLEFT|wxRIGHT, 20)
+        EVT_RADIOBUTTON(self, RBUT1, self.EvtRadioButton)
+        EVT_RADIOBUTTON(self, RBUT2, self.EvtRadioButton)
+
+        self.SetSizer(sizer)
 
 
     def EvtRadioBox(self, event):
         self.log.WriteText('EvtRadioBox: %d\n' % event.GetInt())
 
+    def EvtRadioButton(self, event):
+        self.log.write('EvtRadioButton:%d\n' % event.GetInt())
+
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
@@ -50,37 +72,6 @@ def runTest(frame, nb, log):
 overview = """\
 A radio box item is used to select one of number of mutually exclusive choices.  It is displayed as a vertical column or horizontal row of labelled buttons.
 
-wxRadioBox()
-----------------------
-
-Default constructor.
-
-wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "radioBox")
-
-Constructor, creating and showing a radiobox.
-
-Parameters
--------------------
-
-parent = Parent window. Must not be NULL.
-
-id = Window identifier. A value of -1 indicates a default value.
-
-label = Label for the static box surrounding the radio buttons.
-
-pos = Window position. If the position (-1, -1) is specified then a default position is chosen.
-
-size = Window size. If the default size (-1, -1) is specified then a default size is chosen.
-
-n = Number of choices with which to initialize the radiobox.
-
-choices = An array of choices with which to initialize the radiobox.
-
-majorDimension = Specifies the maximum number of rows (if style contains wxRA_SPECIFY_ROWS) or columns (if style contains wxRA_SPECIFY_COLS) for a two-dimensional radiobox.
-
-style = Window style. See wxRadioBox.
+"""
 
-validator = Window validator.
 
-name = Window name.
-"""