diff --git a/include/wx/defs.h b/include/wx/defs.h index 2af9664744..1871ae13e4 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1568,9 +1568,8 @@ enum wxBorder /* * wxRadioBox style flags + * These styles are not used in any port. */ -/* should we number the items from left to right or from top to bottom in a 2d */ -/* radiobox? */ #define wxRA_LEFTTORIGHT 0x0001 #define wxRA_TOPTOBOTTOM 0x0002 diff --git a/interface/wx/defs.h b/interface/wx/defs.h index 1e1e47431d..2359cdcaab 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -379,9 +379,8 @@ enum wxBorder /* * wxRadioBox style flags + * These styles are not used in any port. */ -/* should we number the items from left to right or from top to bottom in a 2d */ -/* radiobox? */ #define wxRA_LEFTTORIGHT 0x0001 #define wxRA_TOPTOBOTTOM 0x0002 diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp index 2d109a51fe..048b79ea5a 100644 --- a/samples/widgets/radiobox.cpp +++ b/samples/widgets/radiobox.cpp @@ -60,14 +60,6 @@ enum RadioPage_Radio }; -// layout direction radiobox selections -enum -{ - RadioDir_Default, - RadioDir_LtoR, - RadioDir_TtoB -}; - // default values for the number of radiobox items static const unsigned int DEFAULT_NUM_ENTRIES = 12; static const unsigned int DEFAULT_MAJOR_DIM = 3; @@ -123,7 +115,6 @@ protected: wxCheckBox *m_chkSpecifyRows; wxCheckBox *m_chkEnableItem; wxCheckBox *m_chkShowItem; - wxRadioBox *m_radioDir; // the gauge itself and the sizer it is in wxRadioBox *m_radio; @@ -197,8 +188,7 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book, m_textLabelBtns = m_textLabel = (wxTextCtrl *)NULL; - m_radio = - m_radioDir = (wxRadioBox *)NULL; + m_radio = (wxRadioBox *)NULL; m_sizerRadio = (wxSizer *)NULL; } @@ -217,24 +207,6 @@ void RadioWidgetsPage::CreateContent() "Major specifies &rows count" ); - static const wxString layoutDir[] = - { - "default", - "left to right", - "top to bottom" - }; - - m_radioDir = new wxRadioBox(this, wxID_ANY, "Numbering:", - wxDefaultPosition, wxDefaultSize, - 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 -#ifndef wxRA_LEFTTORIGHT - m_radioDir->Disable(); -#endif // wxRA_LEFTTORIGHT - wxSizer *sizerRow; sizerRow = CreateSizerWithTextAndLabel("&Major dimension:", wxID_ANY, @@ -320,7 +292,6 @@ void RadioWidgetsPage::Reset() m_chkSpecifyRows->SetValue(false); m_chkEnableItem->SetValue(true); m_chkShowItem->SetValue(true); - m_radioDir->SetSelection(RadioDir_Default); } void RadioWidgetsPage::CreateRadio() @@ -371,26 +342,6 @@ void RadioWidgetsPage::CreateRadio() flags |= GetAttrs().m_defaultFlags; -#ifdef wxRA_LEFTTORIGHT - switch ( m_radioDir->GetSelection() ) - { - default: - wxFAIL_MSG( "unexpected wxRadioBox layout direction" ); - wxFALLTHROUGH; - - case RadioDir_Default: - break; - - case RadioDir_LtoR: - flags |= wxRA_LEFTTORIGHT; - break; - - case RadioDir_TtoB: - flags |= wxRA_TOPTOBOTTOM; - break; - } -#endif // wxRA_LEFTTORIGHT - m_radio = new wxRadioBox(this, RadioPage_Radio, m_textLabel->GetValue(), wxDefaultPosition, wxDefaultSize, diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index dd3049631b..50883e472f 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -140,28 +140,8 @@ bool wxRadioBox::Create(wxWindow *parent, const wxValidator& wxVALIDATOR_PARAM(val), const wxString& name) { - // for compatibility with the other ports which don't handle (yet?) - // wxRA_LEFTTORIGHT and wxRA_TOPTOBOTTOM flags, we add them ourselves if - // not specified - if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) ) - { - // horizontal radiobox use left to right layout - if ( style & wxRA_SPECIFY_COLS ) - { - style |= wxRA_LEFTTORIGHT; - } - else if ( style & wxRA_SPECIFY_ROWS ) - { - style |= wxRA_TOPTOBOTTOM; - } - else - { - wxFAIL_MSG( wxT("you must specify wxRA_XXX style!") ); - - // use default - style = wxRA_SPECIFY_COLS | wxRA_LEFTTORIGHT; - } - } + if ( !(style & (wxRA_SPECIFY_ROWS | wxRA_SPECIFY_COLS)) ) + style |= wxRA_SPECIFY_COLS; if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) return false; @@ -447,7 +427,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height) { m_buttons[n]->SetSize(x, y, sizeBtn.x, sizeBtn.y); - if ( GetWindowStyle() & wxRA_TOPTOBOTTOM ) + if ( GetWindowStyle() & wxRA_SPECIFY_ROWS ) { // from top to bottom if ( (n + 1) % GetRowCount() ) @@ -462,7 +442,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height) y = y0; } } - else // wxRA_LEFTTORIGHT: mirror the code above + else // wxRA_SPECIFY_COLS: mirror the code above { // from left to right if ( (n + 1) % GetColumnCount() )