X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..cd560c961a09a8ae80b9c32856e195ed784cc547:/src/univ/checklst.cpp?ds=sidebyside diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp index 5a1c9c0cd5..347c3766f7 100644 --- a/src/univ/checklst.cpp +++ b/src/univ/checklst.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "checklst.h" + #pragma implementation "univchecklst.h" #endif #include "wx/wxprec.h" @@ -211,26 +211,26 @@ wxStdCheckListboxInputHandler(wxInputHandler *inphand) { } -bool wxStdCheckListboxInputHandler::HandleKey(wxControl *control, +bool wxStdCheckListboxInputHandler::HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed) { if ( pressed && (event.GetKeyCode() == WXK_SPACE) ) - control->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE); + consumer->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE); - return wxStdListboxInputHandler::HandleKey(control, event, pressed); + return wxStdListboxInputHandler::HandleKey(consumer, event, pressed); } -bool wxStdCheckListboxInputHandler::HandleMouse(wxControl *control, +bool wxStdCheckListboxInputHandler::HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { if ( event.LeftDown() || event.LeftDClick() ) { - wxCheckListBox *lbox = wxStaticCast(control, wxCheckListBox); + wxCheckListBox *lbox = wxStaticCast(consumer->GetInputWindow(), wxCheckListBox); int x, y; wxPoint pt = event.GetPosition(); - pt -= control->GetClientAreaOrigin(); + pt -= consumer->GetInputWindow()->GetClientAreaOrigin(); lbox->CalcUnscrolledPosition(pt.x, pt.y, &x, &y); wxRenderer *renderer = lbox->GetRenderer(); @@ -248,7 +248,7 @@ bool wxStdCheckListboxInputHandler::HandleMouse(wxControl *control, } } - return wxStdListboxInputHandler::HandleMouse(control, event); + return wxStdListboxInputHandler::HandleMouse(consumer, event); } #endif // wxUSE_CHECKLISTBOX