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

1. moved m_majorDim duplicated in many ports to wxRadioBoxBase

Browse Source 
2. also implement Getcolumn/RowCount() in it now and document them
3. removed various remains of old (pre-wxRadioBoxBase) cruft

sorry in advance for any compilation breakage on the platforms I can't test on


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-11-30 16:28:15 +00:00
parent 344d0d8821
commit 21e0a4d5f1
19 changed files with 111 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/univ/radiobox.cpp
View File

@@ -95,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
void wxRadioBox::Init()
{
m_selection = -1;
m_majorDim = 0;
}
wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -174,7 +173,7 @@ bool wxRadioBox::Create(wxWindow *parent,
Append(n, choices);
// majorDim default value is 0 which means make one row/column
SetMajorDim(majorDim == 0 ? n : majorDim);
SetMajorDim(majorDim == 0 ? n : majorDim, style);
if ( size == wxDefaultSize )
{
@@ -211,26 +210,6 @@ wxRadioBox::~wxRadioBox()
// wxRadioBox init
// ----------------------------------------------------------------------------
void wxRadioBox::SetMajorDim(int majorDim)
{
wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
m_majorDim = majorDim;
int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
if ( GetWindowStyle() & wxRA_SPECIFY_COLS )
{
m_numCols = majorDim;
m_numRows = minorDim;
}
else // wxRA_SPECIFY_ROWS
{
m_numCols = minorDim;
m_numRows = majorDim;
}
}
void wxRadioBox::Append(int count, const wxString *choices)
{
if ( !count )
@@ -420,8 +399,8 @@ wxSize wxRadioBox::DoGetBestClientSize() const
{
wxSize sizeBtn = GetMaxButtonSize();
sizeBtn.x *= m_numCols;
sizeBtn.y *= m_numRows;
sizeBtn.x *= GetColumnCount();
sizeBtn.y *= GetRowCount();
// add a border around all buttons
sizeBtn.x += 2*BOX_BORDER_X;
@@ -457,7 +436,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
{
// from top to bottom
if ( (n + 1) % m_numRows )
if ( (n + 1) % GetRowCount() )
{
// continue in this column
y += sizeBtn.y;
@@ -472,7 +451,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
else // wxRA_LEFTTORIGHT: mirror the code above
{
// from left to right
if ( (n + 1) % m_numCols )
if ( (n + 1) % GetColumnCount() )
{
// continue in this row
x += sizeBtn.x;