Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / widgets / radiobox.cpp

diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 3f5fc02e39ee65a207306c43f205ccf86072ea9d..f7b0296772d41e74582e11352ca8d4ec0f7827b4 100644 (file)
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        radiobox.cpp
 // Purpose:     Part of the widgets sample showing wxRadioBox
 // Author:      Vadim Zeitlin
 // Created:     15.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Name:        radiobox.cpp
 // Purpose:     Part of the widgets sample showing wxRadioBox
 // Author:      Vadim Zeitlin
 // Created:     15.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

-// License:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,10 +24,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_RADIOBOX
+

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 

+    #include "wx/bitmap.h"

     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"


@@ -48,11 +51,13 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    RadioPage_Reset = 100,
+    RadioPage_Reset = wxID_HIGHEST,

     RadioPage_Update,
     RadioPage_Selection,
     RadioPage_Label,
     RadioPage_LabelBtn,
     RadioPage_Update,
     RadioPage_Selection,
     RadioPage_Label,
     RadioPage_LabelBtn,

+    RadioPage_EnableItem,
+    RadioPage_ShowItem,

     RadioPage_Radio
 };
 
     RadioPage_Radio
 };
 


@@ -65,8 +70,11 @@ enum
 };
 
 // default values for the number of radiobox items
 };
 
 // default values for the number of radiobox items

-static const size_t DEFAULT_NUM_ENTRIES = 12;
-static const size_t DEFAULT_MAJOR_DIM = 4;
+static const unsigned int DEFAULT_NUM_ENTRIES = 12;
+static const unsigned int DEFAULT_MAJOR_DIM = 3;
+
+// this item is enabled/disabled shown/hidden by the test checkboxes
+static const int TEST_BUTTON = 1;

 
 // ----------------------------------------------------------------------------
 // RadioWidgetsPage
 
 // ----------------------------------------------------------------------------
 // RadioWidgetsPage


@@ -75,8 +83,14 @@ static const size_t DEFAULT_MAJOR_DIM = 4;
 class RadioWidgetsPage : public WidgetsPage
 {
 public:
 class RadioWidgetsPage : public WidgetsPage
 {
 public:

-    RadioWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~RadioWidgetsPage();
+    RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+    virtual ~RadioWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { return m_radio; }
+    virtual void RecreateWidget() { CreateRadio(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -89,9 +103,14 @@ protected:
     void OnButtonSelection(wxCommandEvent& event);
     void OnButtonSetLabel(wxCommandEvent& event);
 
     void OnButtonSelection(wxCommandEvent& event);
     void OnButtonSetLabel(wxCommandEvent& event);
 

+    void OnEnableItem(wxCommandEvent& event);
+    void OnShowItem(wxCommandEvent& event);
+

     void OnUpdateUIReset(wxUpdateUIEvent& event);
     void OnUpdateUIUpdate(wxUpdateUIEvent& event);
     void OnUpdateUISelection(wxUpdateUIEvent& event);
     void OnUpdateUIReset(wxUpdateUIEvent& event);
     void OnUpdateUIUpdate(wxUpdateUIEvent& event);
     void OnUpdateUISelection(wxUpdateUIEvent& event);

+    void OnUpdateUIEnableItem(wxUpdateUIEvent& event);
+    void OnUpdateUIShowItem(wxUpdateUIEvent& event);

 
     // reset the wxRadioBox parameters
     void Reset();
 
     // reset the wxRadioBox parameters
     void Reset();


@@ -103,7 +122,9 @@ protected:
     // ------------
 
     // the check/radio boxes for styles
     // ------------
 
     // the check/radio boxes for styles

-    wxCheckBox *m_chkVert;
+    wxCheckBox *m_chkSpecifyRows;
+    wxCheckBox *m_chkEnableItem;
+    wxCheckBox *m_chkShowItem;

     wxRadioBox *m_radioDir;
 
     // the gauge itself and the sizer it is in
     wxRadioBox *m_radioDir;
 
     // the gauge itself and the sizer it is in


@@ -141,24 +162,38 @@ BEGIN_EVENT_TABLE(RadioWidgetsPage, WidgetsPage)
 
     EVT_RADIOBOX(RadioPage_Radio, RadioWidgetsPage::OnRadioBox)
 
 
     EVT_RADIOBOX(RadioPage_Radio, RadioWidgetsPage::OnRadioBox)
 

-    EVT_CHECKBOX(-1, RadioWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, RadioWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(RadioPage_EnableItem, RadioWidgetsPage::OnEnableItem)
+    EVT_CHECKBOX(RadioPage_ShowItem, RadioWidgetsPage::OnShowItem)
+
+    EVT_UPDATE_UI(RadioPage_EnableItem, RadioWidgetsPage::OnUpdateUIEnableItem)
+    EVT_UPDATE_UI(RadioPage_ShowItem, RadioWidgetsPage::OnUpdateUIShowItem)
+
+    EVT_CHECKBOX(wxID_ANY, RadioWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, RadioWidgetsPage::OnCheckOrRadioBox)

 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, wxT("Radio"),
+                       FAMILY_CTRLS | WITH_ITEMS_CTRLS
+                       );

 
 

-RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
-                                       wxImageList *imaglist)
-                  : WidgetsPage(notebook)
+RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
+                                   wxImageList *imaglist)
+                  : WidgetsPage(book, imaglist, radio_xpm)

 {
 {

-    imaglist->Add(wxBitmap(radio_xpm));
-

     // init everything
     // init everything

-    m_chkVert = (wxCheckBox *)NULL;
+    m_chkSpecifyRows = (wxCheckBox *)NULL;
+    m_chkEnableItem = (wxCheckBox *)NULL;
+    m_chkShowItem = (wxCheckBox *)NULL;

 
     m_textNumBtns =
     m_textLabelBtns =
 
     m_textNumBtns =
     m_textLabelBtns =


@@ -167,26 +202,34 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
     m_radio =
     m_radioDir = (wxRadioBox *)NULL;
     m_sizerRadio = (wxSizer *)NULL;
     m_radio =
     m_radioDir = (wxRadioBox *)NULL;
     m_sizerRadio = (wxSizer *)NULL;

+}

 
 

+void RadioWidgetsPage::CreateContent()
+{

     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));

 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 

-    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical layout"));
+    m_chkSpecifyRows = CreateCheckBoxAndAddToSizer
+                       (
+                        sizerLeft,
+                        "Major specifies &rows count"
+                       );

 
     static const wxString layoutDir[] =
     {
 
     static const wxString layoutDir[] =
     {

-        _T("default"),
-        _T("left to right"),
-        _T("top to bottom")
+        wxT("default"),
+        wxT("left to right"),
+        wxT("top to bottom")

     };
 
     };
 

-    m_radioDir = new wxRadioBox(this, -1, _T("Numbering:"),
+    m_radioDir = new wxRadioBox(this, wxID_ANY, wxT("Numbering:"),

                                 wxDefaultPosition, wxDefaultSize,
                                 wxDefaultPosition, wxDefaultSize,

-                                WXSIZEOF(layoutDir), layoutDir);
+                                WXSIZEOF(layoutDir), layoutDir,
+                                1, wxRA_SPECIFY_COLS);

     sizerLeft->Add(m_radioDir, 0, wxGROW | wxALL, 5);
 
     // if it's not defined, we can't change the radiobox direction
     sizerLeft->Add(m_radioDir, 0, wxGROW | wxALL, 5);
 
     // if it's not defined, we can't change the radiobox direction


@@ -195,55 +238,62 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
 #endif // wxRA_LEFTTORIGHT
 
     wxSizer *sizerRow;
 #endif // wxRA_LEFTTORIGHT
 
     wxSizer *sizerRow;

-    sizerRow = CreateSizerWithTextAndLabel(_T("&Major dimension"),
-                                           -1,
+    sizerRow = CreateSizerWithTextAndLabel(wxT("&Major dimension:"),
+                                           wxID_ANY,

                                            &m_textMajorDim);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
                                            &m_textMajorDim);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 

-    sizerRow = CreateSizerWithTextAndLabel(_T("&Number of buttons"),
-                                           -1,
+    sizerRow = CreateSizerWithTextAndLabel(wxT("&Number of buttons:"),
+                                           wxID_ANY,

                                            &m_textNumBtns);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     wxButton *btn;
                                            &m_textNumBtns);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     wxButton *btn;

-    btn = new wxButton(this, RadioPage_Update, _T("&Update"));
+    btn = new wxButton(this, RadioPage_Update, wxT("&Update"));

     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 

-    btn = new wxButton(this, RadioPage_Reset, _T("&Reset"));
+    btn = new wxButton(this, RadioPage_Reset, wxT("&Reset"));

     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change parameters"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change parameters"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 

-    sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
-                                           -1,
+    sizerRow = CreateSizerWithTextAndLabel(wxT("Current selection:"),
+                                           wxID_ANY,

                                            &m_textCurSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
                                            &m_textCurSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,

-                                            _T("&Change selection"),
-                                           -1,
+                                            wxT("&Change selection:"),
+                                           wxID_ANY,

                                            &m_textSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
                                            &m_textSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,

-                                            _T("&Label for box"),
-                                            -1,
+                                            wxT("&Label for box:"),
+                                            wxID_ANY,

                                             &m_textLabel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
                                             &m_textLabel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,

-                                            _T("&Label for buttons"),
-                                            -1,
+                                            wxT("&Label for buttons:"),
+                                            wxID_ANY,

                                             &m_textLabelBtns);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
                                             &m_textLabelBtns);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 

+    m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
+                                                  wxT("Disable &2nd item"),
+                                                  RadioPage_EnableItem);
+    m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
+                                                wxT("Hide 2nd &item"),
+                                                RadioPage_ShowItem);
+

     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);

-    sizerRight->SetMinSize(250, 0);
+    sizerRight->SetMinSize(150, 0);

     m_sizerRadio = sizerRight; // save it to modify it later
 
     Reset();
     m_sizerRadio = sizerRight; // save it to modify it later
 
     Reset();


@@ -252,17 +302,10 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
     // the 3 panes panes compose the window
     sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
     sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);
     // the 3 panes panes compose the window
     sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
     sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);

-    sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
+    sizerTop->Add(sizerRight, 0, wxGROW | (wxALL & ~wxRIGHT), 10);

 
     // final initializations
 
     // final initializations

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);
-}
-
-RadioWidgetsPage::~RadioWidgetsPage()
-{

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -271,12 +314,14 @@ RadioWidgetsPage::~RadioWidgetsPage()
 
 void RadioWidgetsPage::Reset()
 {
 
 void RadioWidgetsPage::Reset()
 {

-    m_textMajorDim->SetValue(wxString::Format(_T("%d"), DEFAULT_MAJOR_DIM));
-    m_textNumBtns->SetValue(wxString::Format(_T("%d"), DEFAULT_NUM_ENTRIES));
-    m_textLabel->SetValue(_T("I'm a radiobox"));
-    m_textLabelBtns->SetValue(_T("item"));
-
-    m_chkVert->SetValue(FALSE);
+    m_textMajorDim->SetValue(wxString::Format(wxT("%u"), DEFAULT_MAJOR_DIM));
+    m_textNumBtns->SetValue(wxString::Format(wxT("%u"), DEFAULT_NUM_ENTRIES));
+    m_textLabel->SetValue(wxT("I'm a radiobox"));
+    m_textLabelBtns->SetValue(wxT("item"));
+
+    m_chkSpecifyRows->SetValue(false);
+    m_chkEnableItem->SetValue(true);
+    m_chkShowItem->SetValue(true);

     m_radioDir->SetSelection(RadioDir_Default);
 }
 
     m_radioDir->SetSelection(RadioDir_Default);
 }
 


@@ -287,7 +332,7 @@ void RadioWidgetsPage::CreateRadio()
     {
         sel = m_radio->GetSelection();
 
     {
         sel = m_radio->GetSelection();
 

-        m_sizerRadio->Remove(m_radio);
+        m_sizerRadio->Detach( m_radio );

 
         delete m_radio;
     }
 
         delete m_radio;
     }


@@ -299,7 +344,7 @@ void RadioWidgetsPage::CreateRadio()
     unsigned long count;
     if ( !m_textNumBtns->GetValue().ToULong(&count) )
     {
     unsigned long count;
     if ( !m_textNumBtns->GetValue().ToULong(&count) )
     {

-        wxLogWarning(_T("Should have a valid number for number of items."));
+        wxLogWarning(wxT("Should have a valid number for number of items."));

 
         // fall back to default
         count = DEFAULT_NUM_ENTRIES;
 
         // fall back to default
         count = DEFAULT_NUM_ENTRIES;


@@ -308,7 +353,7 @@ void RadioWidgetsPage::CreateRadio()
     unsigned long majorDim;
     if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
     {
     unsigned long majorDim;
     if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
     {

-        wxLogWarning(_T("Should have a valid major dimension number."));
+        wxLogWarning(wxT("Should have a valid major dimension number."));

 
         // fall back to default
         majorDim = DEFAULT_MAJOR_DIM;
 
         // fall back to default
         majorDim = DEFAULT_MAJOR_DIM;


@@ -319,17 +364,20 @@ void RadioWidgetsPage::CreateRadio()
     wxString labelBtn = m_textLabelBtns->GetValue();
     for ( size_t n = 0; n < count; n++ )
     {
     wxString labelBtn = m_textLabelBtns->GetValue();
     for ( size_t n = 0; n < count; n++ )
     {

-        items[n] = wxString::Format(_T("%s %u"), labelBtn.c_str(), n + 1);
+        items[n] = wxString::Format(wxT("%s %lu"),
+                                    labelBtn.c_str(), (unsigned long)n + 1);

     }
 
     }
 

-    int flags = m_chkVert->GetValue() ? wxRA_VERTICAL
-                                      : wxRA_HORIZONTAL;
+    int flags = m_chkSpecifyRows->GetValue() ? wxRA_SPECIFY_ROWS
+                                             : wxRA_SPECIFY_COLS;
+
+    flags |= ms_defaultFlags;

 
 #ifdef wxRA_LEFTTORIGHT
     switch ( m_radioDir->GetSelection() )
     {
         default:
 
 #ifdef wxRA_LEFTTORIGHT
     switch ( m_radioDir->GetSelection() )
     {
         default:

-            wxFAIL_MSG( _T("unexpected wxRadioBox layout direction") );
+            wxFAIL_MSG( wxT("unexpected wxRadioBox layout direction") );

             // fall through
 
         case RadioDir_Default:
             // fall through
 
         case RadioDir_Default:


@@ -361,6 +409,9 @@ void RadioWidgetsPage::CreateRadio()
 
     m_sizerRadio->Add(m_radio, 1, wxGROW);
     m_sizerRadio->Layout();
 
     m_sizerRadio->Add(m_radio, 1, wxGROW);
     m_sizerRadio->Layout();

+
+    m_chkEnableItem->SetValue(true);
+    m_chkEnableItem->SetValue(true);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -374,7 +425,7 @@ void RadioWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
     CreateRadio();
 }
 
     CreateRadio();
 }
 

-void RadioWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void RadioWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))

 {
     CreateRadio();
 }
 {
     CreateRadio();
 }


@@ -382,13 +433,15 @@ void RadioWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
 void RadioWidgetsPage::OnRadioBox(wxCommandEvent& event)
 {
     int sel = m_radio->GetSelection();
 void RadioWidgetsPage::OnRadioBox(wxCommandEvent& event)
 {
     int sel = m_radio->GetSelection();

+    int event_sel = event.GetSelection();
+    wxUnusedVar(event_sel);

 
 

-    wxLogMessage(_T("Radiobox selection changed, now %d"), sel);
+    wxLogMessage(wxT("Radiobox selection changed, now %d"), sel);

 
 

-    wxASSERT_MSG( sel == event.GetSelection(),
-                  _T("selection should be the same in event and radiobox") );
+    wxASSERT_MSG( sel == event_sel,
+                  wxT("selection should be the same in event and radiobox") );

 
 

-    m_textCurSel->SetValue(wxString::Format(_T("%d"), sel));
+    m_textCurSel->SetValue(wxString::Format(wxT("%d"), sel));

 }
 
 void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))
 }
 
 void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))


@@ -407,7 +460,7 @@ void RadioWidgetsPage::OnButtonSelection(wxCommandEvent& WXUNUSED(event))
     if ( !m_textSel->GetValue().ToULong(&sel) ||
             (sel >= (size_t)m_radio->GetCount()) )
     {
     if ( !m_textSel->GetValue().ToULong(&sel) ||
             (sel >= (size_t)m_radio->GetCount()) )
     {

-        wxLogWarning(_T("Invalid number specified as new selection."));
+        wxLogWarning(wxT("Invalid number specified as new selection."));

     }
     else
     {
     }
     else
     {


@@ -415,6 +468,16 @@ void RadioWidgetsPage::OnButtonSelection(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void RadioWidgetsPage::OnEnableItem(wxCommandEvent& event)
+{
+    m_radio->Enable(TEST_BUTTON, event.IsChecked());
+}
+
+void RadioWidgetsPage::OnShowItem(wxCommandEvent& event)
+{
+    m_radio->Show(TEST_BUTTON, event.IsChecked());
+}
+

 void RadioWidgetsPage::OnUpdateUIUpdate(wxUpdateUIEvent& event)
 {
     unsigned long n;
 void RadioWidgetsPage::OnUpdateUIUpdate(wxUpdateUIEvent& event)
 {
     unsigned long n;


@@ -432,7 +495,7 @@ void RadioWidgetsPage::OnUpdateUISelection(wxUpdateUIEvent& event)
 void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
 {
     // only enable it if something is not set to default
 void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
 {
     // only enable it if something is not set to default

-    bool enable = m_chkVert->GetValue();
+    bool enable = m_chkSpecifyRows->GetValue();

 
     if ( !enable )
     {
 
     if ( !enable )
     {


@@ -453,3 +516,16 @@ void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
     event.Enable(enable);
 }
 
     event.Enable(enable);
 }
 

+void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
+{
+    event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ? wxT("Disable &2nd item")
+                                                      : wxT("Enable &2nd item"));
+}
+
+void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
+{
+    event.SetText(m_radio->IsItemShown(TEST_BUTTON) ? wxT("Hide 2nd &item")
+                                                    : wxT("Show 2nd &item"));
+}
+
+#endif // wxUSE_RADIOBOX