X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3870b2ff595ba4bb4f0397ace77ceeb9628e94d..4b04699b670b4ab4632229fa0264d154acd3bec1:/src/univ/listbox.cpp?ds=sidebyside diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index af3ca7eee5..725eafa5ec 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -101,7 +101,14 @@ bool wxListBox::Create(wxWindow *parent, if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) ) style |= wxLB_SINGLE; - if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) +#if wxUSE_TWO_WINDOWS + style |= wxVSCROLL|wxHSCROLL; + if ((style & wxBORDER_MASK) == 0) + style |= wxBORDER_SUNKEN; +#endif + + if ( !wxControl::Create(parent, id, pos, size, style, + wxDefaultValidator, name) ) return FALSE; SetWindow(this); @@ -805,11 +812,6 @@ wxSize wxListBox::DoGetBestClientSize() const bool wxListBox::SendEvent(wxEventType type, int item) { - // don't generate select events while the mouse is captured, we will only - // send them once it is released - if ( (type == wxEVT_COMMAND_LISTBOX_SELECTED) && (GetCapture() == this) ) - return FALSE; - wxCommandEvent event(type, m_windowId); event.SetEventObject(this); @@ -1054,6 +1056,19 @@ void wxListBox::Activate(int item) // input handling // ---------------------------------------------------------------------------- +/* + The numArg here is the listbox item index while the strArg is used + differently for the different actions: + + a) for wxACTION_LISTBOX_FIND it has the natural meaning: this is the string + to find + + b) for wxACTION_LISTBOX_SELECT and wxACTION_LISTBOX_EXTENDSEL it is used + to decide if the listbox should send the notification event (it is empty) + or not (it is not): this allows us to reuse the same action for when the + user is dragging the mouse when it has been released although in the + first case no notification is sent while in the second it is sent. + */ bool wxListBox::PerformAction(const wxControlAction& action, long numArg, const wxString& strArg) @@ -1061,9 +1076,13 @@ bool wxListBox::PerformAction(const wxControlAction& action, int item = (int)numArg; if ( action == wxACTION_LISTBOX_SETFOCUS ) + { SetCurrentItem(item); + } else if ( action == wxACTION_LISTBOX_ACTIVATE ) + { Activate(item); + } else if ( action == wxACTION_LISTBOX_TOGGLE ) { if ( item == -1 ) @@ -1077,7 +1096,11 @@ bool wxListBox::PerformAction(const wxControlAction& action, else if ( action == wxACTION_LISTBOX_SELECT ) { DeselectAll(item); - SelectAndNotify(item); + + if ( strArg.empty() ) + SelectAndNotify(item); + else + Select(TRUE, item); } else if ( action == wxACTION_LISTBOX_SELECTADD ) Select(TRUE, item); @@ -1236,7 +1259,7 @@ wxStdListboxInputHandler::SetupCapture(wxListBox *lbox, return action; } -bool wxStdListboxInputHandler::HandleKey(wxControl *control, +bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed) { @@ -1244,7 +1267,7 @@ bool wxStdListboxInputHandler::HandleKey(wxControl *control, if ( pressed && !event.AltDown() ) { bool isMoveCmd = TRUE; - int style = control->GetWindowStyle(); + int style = consumer->GetInputWindow()->GetWindowStyle(); wxControlAction action; wxString strArg; @@ -1253,12 +1276,33 @@ bool wxStdListboxInputHandler::HandleKey(wxControl *control, switch ( keycode ) { // movement - case WXK_UP: action = wxACTION_LISTBOX_MOVEUP; break; - case WXK_DOWN: action = wxACTION_LISTBOX_MOVEDOWN; break; - case WXK_PRIOR: action = wxACTION_LISTBOX_PAGEUP; break; - case WXK_NEXT: action = wxACTION_LISTBOX_PAGEDOWN; break; - case WXK_HOME: action = wxACTION_LISTBOX_START; break; - case WXK_END: action = wxACTION_LISTBOX_END; break; + case WXK_UP: + action = wxACTION_LISTBOX_MOVEUP; + break; + + case WXK_DOWN: + action = wxACTION_LISTBOX_MOVEDOWN; + break; + + case WXK_PAGEUP: + + case WXK_PRIOR: + action = wxACTION_LISTBOX_PAGEUP; + break; + + case WXK_PAGEDOWN: + + case WXK_NEXT: + action = wxACTION_LISTBOX_PAGEDOWN; + break; + + case WXK_HOME: + action = wxACTION_LISTBOX_START; + break; + + case WXK_END: + action = wxACTION_LISTBOX_END; + break; // selection case WXK_SPACE: @@ -1284,24 +1328,24 @@ bool wxStdListboxInputHandler::HandleKey(wxControl *control, if ( !!action ) { - control->PerformAction(action, -1, strArg); + consumer->PerformAction(action, -1, strArg); if ( isMoveCmd ) { if ( style & wxLB_SINGLE ) { // the current item is always the one selected - control->PerformAction(wxACTION_LISTBOX_SELECT); + consumer->PerformAction(wxACTION_LISTBOX_SELECT); } else if ( style & wxLB_EXTENDED ) { if ( event.ShiftDown() ) - control->PerformAction(wxACTION_LISTBOX_EXTENDSEL); + consumer->PerformAction(wxACTION_LISTBOX_EXTENDSEL); else { // select the item and make it the new selection anchor - control->PerformAction(wxACTION_LISTBOX_SELECT); - control->PerformAction(wxACTION_LISTBOX_ANCHOR); + consumer->PerformAction(wxACTION_LISTBOX_SELECT); + consumer->PerformAction(wxACTION_LISTBOX_ANCHOR); } } //else: nothing to do for multiple selection listboxes @@ -1311,13 +1355,13 @@ bool wxStdListboxInputHandler::HandleKey(wxControl *control, } } - return wxStdInputHandler::HandleKey(control, event, pressed); + return wxStdInputHandler::HandleKey(consumer, event, pressed); } -bool wxStdListboxInputHandler::HandleMouse(wxControl *control, +bool wxStdListboxInputHandler::HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { - wxListBox *lbox = wxStaticCast(control, wxListBox); + wxListBox *lbox = wxStaticCast(consumer->GetInputWindow(), wxListBox); int item = HitTest(lbox, event); wxControlAction action; @@ -1340,7 +1384,6 @@ bool wxStdListboxInputHandler::HandleMouse(wxControl *control, winCapture->ReleaseMouse(); m_btnCapture = 0; - // generate the last event to triiger sending the selection event action = m_actionMouse; } //else: the mouse wasn't presed over the listbox, only released here @@ -1357,16 +1400,16 @@ bool wxStdListboxInputHandler::HandleMouse(wxControl *control, return TRUE; } - return wxStdInputHandler::HandleMouse(control, event); + return wxStdInputHandler::HandleMouse(consumer, event); } -bool wxStdListboxInputHandler::HandleMouseMove(wxControl *control, +bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { wxWindow *winCapture = wxWindow::GetCapture(); if ( winCapture && (event.GetEventObject() == winCapture) ) { - wxListBox *lbox = wxStaticCast(control, wxListBox); + wxListBox *lbox = wxStaticCast(consumer->GetInputWindow(), wxListBox); if ( !m_btnCapture || !m_trackMouseOutside ) { @@ -1390,7 +1433,9 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxControl *control, if ( IsValidIndex(lbox, item) ) { - lbox->PerformAction(m_actionMouse, item); + // pass something into strArg to tell the listbox that it shouldn't + // send the notification message: see PerformAction() above + lbox->PerformAction(m_actionMouse, item, _T("no")); } // else: don't pass invalid index to the listbox } @@ -1404,7 +1449,7 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxControl *control, } } - return wxStdInputHandler::HandleMouseMove(control, event); + return wxStdInputHandler::HandleMouseMove(consumer, event); } #endif // wxUSE_LISTBOX