X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27d0dcd033be9b1356a36d582f3d3665a53e11e4..30bb5e18acd15fdab9ca70f600eee43771e28928:/src/generic/vlbox.cpp diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp index fedb4496a4..989f6f797d 100644 --- a/src/generic/vlbox.cpp +++ b/src/generic/vlbox.cpp @@ -48,6 +48,8 @@ END_EVENT_TABLE() // implementation // ============================================================================ +IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow) + // ---------------------------------------------------------------------------- // wxVListBox creation // ---------------------------------------------------------------------------- @@ -66,6 +68,7 @@ bool wxVListBox::Create(wxWindow *parent, long style, const wxString& name) { + style |= wxWANTS_CHARS; if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) ) return false; @@ -73,6 +76,12 @@ bool wxVListBox::Create(wxWindow *parent, m_selStore = new wxSelectionStore; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX)); + SetForegroundColour(parent->GetForegroundColour()); + + // ensure that the font actually changes and is set. + SetFont(wxNullFont); + SetFont(parent->GetFont()); + m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); return true; @@ -484,7 +493,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) // flags for DoHandleItemClick() int flags = ItemClick_Kbd; - int current = 0; // just to silent the stupid compiler warnings + int current; switch ( event.GetKeyCode() ) { case WXK_HOME: @@ -535,8 +544,23 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) current = m_current; break; +#ifdef __WXMSW__ + case WXK_TAB: + // Since we are using wxWANTS_CHARS we need to send navigation + // events for the tabs on MSW + { + wxNavigationKeyEvent ne; + ne.SetDirection(!event.ShiftDown()); + ne.SetCurrentFocus(this); + ne.SetEventObject(this); + GetParent()->GetEventHandler()->ProcessEvent(ne); + } + // fall through to default +#endif default: event.Skip(); + current = 0; // just to silent the stupid compiler warnings + wxUnusedVar(current); return; }