added radio button (which doesn't work yet)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-09 22:39:59 +00:00
parent a02336b2bb
commit bc2dad04e7
10 changed files with 313 additions and 29 deletions

View File

@@ -102,15 +102,20 @@ void wxCheckBox::SetValue(bool value)
wxBitmap wxCheckBox::GetBitmap(State state, Status status) const
{
wxBitmap bmp = m_bitmaps[state][m_status];
wxBitmap bmp = m_bitmaps[state][status];
if ( !bmp.Ok() )
bmp = m_bitmaps[State_Normal][m_status];
bmp = m_bitmaps[State_Normal][status];
if ( !bmp.Ok() )
bmp = wxTheme::Get()->GetColourScheme()->Get(state, m_status);
bmp = wxTheme::Get()->GetColourScheme()->GetCheckBitmap(state, status);
return bmp;
}
void wxCheckBox::SetBitmap(const wxBitmap& bmp, State state, Status status)
{
m_bitmaps[state][status] = bmp;
}
// ----------------------------------------------------------------------------
// drawing
// ----------------------------------------------------------------------------
@@ -199,10 +204,10 @@ void wxCheckBox::ChangeValue(bool value)
{
SetValue(value);
Click();
SendEvent();
}
void wxCheckBox::Click()
void wxCheckBox::SendEvent()
{
wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId());
InitCommandEvent(event);
@@ -239,10 +244,6 @@ bool wxCheckBox::PerformAction(const wxControlAction& action,
return TRUE;
}
#endif // wxUSE_CHECKBOX
#if wxUSE_CHECKBOX || wxUSE_RADIOBTN
// ----------------------------------------------------------------------------
// wxStdCheckboxInputHandler
// ----------------------------------------------------------------------------
@@ -264,4 +265,4 @@ bool wxStdCheckboxInputHandler::HandleMouseMove(wxControl *control,
return wxStdButtonInputHandler::HandleMouseMove(control, event);
}
#endif // wxUSE_RADIOBTN || wxUSE_CHECKBOX
#endif // wxUSE_CHECKBOX