X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80c700cba933f16d7db6ad3e5d9026d1fb44c7a1..b931414d91c7240ae42a67b9fc75e18d93aff721:/src/generic/vlbox.cpp?ds=sidebyside diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp index 989f6f797d..2830f19c7b 100644 --- a/src/generic/vlbox.cpp +++ b/src/generic/vlbox.cpp @@ -68,20 +68,16 @@ bool wxVListBox::Create(wxWindow *parent, long style, const wxString& name) { - style |= wxWANTS_CHARS; + style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE; if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) ) return false; if ( style & wxLB_MULTIPLE ) 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()); - + // make sure the native widget has the right colour since we do + // transparent drawing by default + SetBackgroundColour(GetBackgroundColour()); m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); return true; @@ -247,7 +243,7 @@ void wxVListBox::SendSelectedEvent() wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId()); event.SetEventObject(this); - event.m_commandInt = m_current; + event.SetInt(m_current); (void)GetEventHandler()->ProcessEvent(event); } @@ -606,9 +602,22 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& event) { wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); event.SetEventObject(this); - event.m_commandInt = item; + event.SetInt(item); (void)GetEventHandler()->ProcessEvent(event); } } + +// ---------------------------------------------------------------------------- +// use the same default attributes as wxListBox +// ---------------------------------------------------------------------------- + +#include "wx/listbox.h" + +//static +wxVisualAttributes +wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant) +{ + return wxListBox::GetClassDefaultAttributes(variant); +}