X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..b58a1455e15477cac9d335b5f7a2c3fc3111b342:/src/univ/checkbox.cpp?ds=inline diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index 916ea5c501..c9a95a6318 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -154,10 +154,12 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer) if ( m_status == Status_Checked ) flags |= wxCONTROL_CHECKED; + wxBitmap bitmap(GetBitmap(GetState(flags), m_status)); + renderer->GetRenderer()-> DrawCheckButton(dc, GetLabel(), - GetBitmap(GetState(flags), m_status), + bitmap, renderer->GetRect(), flags, GetWindowStyle() & wxALIGN_RIGHT ? wxALIGN_RIGHT @@ -276,12 +278,12 @@ wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *inphand) { } -bool wxStdCheckboxInputHandler::HandleActivation(wxControl *control, +bool wxStdCheckboxInputHandler::HandleActivation(wxInputConsumer *consumer, bool activated) { // only the focused checkbox appearance changes when the app gains/loses // activation - return control->IsFocused(); + return consumer->GetInputWindow()->IsFocused(); } #endif // wxUSE_CHECKBOX