Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxRA_SPECIFY_COLS/ROWS instead of old, deprecated and confusing wxRA_HORIZONTAL/VERTICAL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-03 22:33:32 +00:00
parent e77669fcee
commit 3998c74b9b
12 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/widgets/radiobox.cpp
View File

@@ -122,7 +122,7 @@ protected:
// ------------
// the check/radio boxes for styles
wxCheckBox *m_chkVert;
wxCheckBox *m_chkSpecifyRows;
wxCheckBox *m_chkEnableItem;
wxCheckBox *m_chkShowItem;
wxRadioBox *m_radioDir;
@@ -191,7 +191,7 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
: WidgetsPage(book, imaglist, radio_xpm)
{
// init everything
m_chkVert = (wxCheckBox *)NULL;
m_chkSpecifyRows = (wxCheckBox *)NULL;
m_chkEnableItem = (wxCheckBox *)NULL;
m_chkShowItem = (wxCheckBox *)NULL;
@@ -213,7 +213,11 @@ void RadioWidgetsPage::CreateContent()
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[] =
{
@@ -315,7 +319,7 @@ void RadioWidgetsPage::Reset()
m_textLabel->SetValue(_T("I'm a radiobox"));
m_textLabelBtns->SetValue(_T("item"));
m_chkVert->SetValue(false);
m_chkSpecifyRows->SetValue(false);
m_chkEnableItem->SetValue(true);
m_chkShowItem->SetValue(true);
m_radioDir->SetSelection(RadioDir_Default);
@@ -364,8 +368,8 @@ void RadioWidgetsPage::CreateRadio()
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;
@@ -491,7 +495,7 @@ void RadioWidgetsPage::OnUpdateUISelection(wxUpdateUIEvent& event)
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 )
{