X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..6344162a81f74b3fbab0803405eebc0c0b83e797:/samples/widgets/radiobox.cpp

diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 3594d9de6c..ef45264175 100644
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -28,6 +28,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
+    #include "wx/bitmap.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/radiobox.h"
@@ -38,7 +39,7 @@
 #include "wx/sizer.h"
 
 #include "widgets.h"
-
+#if 1
 #include "icons/radiobox.xpm"
 
 // ----------------------------------------------------------------------------
@@ -65,8 +66,8 @@ enum
 };
 
 // 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;
 
 // ----------------------------------------------------------------------------
 // RadioWidgetsPage
@@ -119,8 +120,8 @@ protected:
                *m_textLabelBtns;
 
 private:
-    DECLARE_EVENT_TABLE();
-    DECLARE_WIDGETS_PAGE(RadioWidgetsPage);
+    DECLARE_EVENT_TABLE()
+    DECLARE_WIDGETS_PAGE(RadioWidgetsPage)
 };
 
 // ----------------------------------------------------------------------------
@@ -186,7 +187,8 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
 
     m_radioDir = new wxRadioBox(this, -1, _T("Numbering:"),
                                 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
@@ -195,12 +197,12 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
 #endif // wxRA_LEFTTORIGHT
 
     wxSizer *sizerRow;
-    sizerRow = CreateSizerWithTextAndLabel(_T("&Major dimension"),
+    sizerRow = CreateSizerWithTextAndLabel(_T("&Major dimension:"),
                                            -1,
                                            &m_textMajorDim);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
-    sizerRow = CreateSizerWithTextAndLabel(_T("&Number of buttons"),
+    sizerRow = CreateSizerWithTextAndLabel(_T("&Number of buttons:"),
                                            -1,
                                            &m_textNumBtns);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
@@ -218,32 +220,32 @@ RadioWidgetsPage::RadioWidgetsPage(wxNotebook *notebook,
     wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change parameters"));
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
-    sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
+    sizerRow = CreateSizerWithTextAndLabel(_T("Current selection:"),
                                            -1,
                                            &m_textCurSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
-                                            _T("&Change selection"),
+                                            _T("&Change selection:"),
                                            -1,
                                            &m_textSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
-                                            _T("&Label for box"),
+                                            _T("&Label for box:"),
                                             -1,
                                             &m_textLabel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
-                                            _T("&Label for buttons"),
+                                            _T("&Label for buttons:"),
                                             -1,
                                             &m_textLabelBtns);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     // 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();
@@ -252,7 +254,7 @@ 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);
-    sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
+    sizerTop->Add(sizerRight, 0, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     // final initializations
     SetAutoLayout(TRUE);
@@ -271,8 +273,8 @@ RadioWidgetsPage::~RadioWidgetsPage()
 
 void RadioWidgetsPage::Reset()
 {
-    m_textMajorDim->SetValue(wxString::Format(_T("%d"), DEFAULT_MAJOR_DIM));
-    m_textNumBtns->SetValue(wxString::Format(_T("%d"), DEFAULT_NUM_ENTRIES));
+    m_textMajorDim->SetValue(wxString::Format(_T("%u"), DEFAULT_MAJOR_DIM));
+    m_textNumBtns->SetValue(wxString::Format(_T("%u"), DEFAULT_NUM_ENTRIES));
     m_textLabel->SetValue(_T("I'm a radiobox"));
     m_textLabelBtns->SetValue(_T("item"));
 
@@ -287,7 +289,7 @@ void RadioWidgetsPage::CreateRadio()
     {
         sel = m_radio->GetSelection();
 
-        m_sizerRadio->Remove(m_radio);
+        m_sizerRadio->Detach( m_radio );
 
         delete m_radio;
     }
@@ -319,7 +321,8 @@ void RadioWidgetsPage::CreateRadio()
     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(_T("%s %lu"),
+                                    labelBtn.c_str(), (unsigned long)n + 1);
     }
 
     int flags = m_chkVert->GetValue() ? wxRA_VERTICAL
@@ -453,3 +456,4 @@ void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
     event.Enable(enable);
 }
 
+#endif