few adaptations to cope with new control.h file

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (JL)
1999-11-19 00:51:56 +00:00
parent 1dd521517c
commit 5008c64c32
3 changed files with 14 additions and 12 deletions

View File

@@ -123,18 +123,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
//-------------------------------------------------------------------------------------
// Enables or disables the entire radiobox
void wxRadioBox::Enable(bool enable)
bool wxRadioBox::Enable(bool enable)
{
int i;
wxRadioButton *current;
wxControl::Enable(enable);
if (!wxControl::Enable(enable))
return (false);
current=m_radioButtonCycle;
for (i=0;i<m_noItems;i++) {
current->Enable(enable);
current=current->NextInCycle();
}
return (true);
}
//-------------------------------------------------------------------------------------
@@ -155,7 +157,6 @@ void wxRadioBox::Enable(int item, bool enable)
i++;
current=current->NextInCycle();
}
return current->Enable(enable);
}
@@ -464,7 +465,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
totHeight = GetNumVer() * (maxHeight + charHeight/2) + charHeight*3/2;
totWidth = GetNumHor() * (maxWidth + charWidth) + charWidth;
wxControl::DoSetSize(x_offset,y_offset,totWidth,totHeight);
wxControl::DoSetSize(x_offset,y_offset,totWidth,totHeight,wxSIZE_AUTO);
// arrange radiobuttons