X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a53b9b8fe6fc88f243f777db03bafa3a9651701..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/generic/vlbox.cpp diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp index bb58622e9b..1c1f33174e 100644 --- a/src/generic/vlbox.cpp +++ b/src/generic/vlbox.cpp @@ -24,12 +24,15 @@ #pragma hdrstop #endif +#if wxUSE_LISTBOX + #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/dcclient.h" #endif //WX_PRECOMP #include "wx/vlbox.h" +#include "wx/dcbuffer.h" #include "wx/selstore.h" // ---------------------------------------------------------------------------- @@ -59,6 +62,7 @@ void wxVListBox::Init() m_current = m_anchor = wxNOT_FOUND; m_selStore = NULL; + m_doubleBuffer = NULL; } bool wxVListBox::Create(wxWindow *parent, @@ -75,20 +79,20 @@ bool wxVListBox::Create(wxWindow *parent, 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); + // flicker-free drawing requires this + SetBackgroundStyle(wxBG_STYLE_CUSTOM); + return true; } wxVListBox::~wxVListBox() { + delete m_doubleBuffer; delete m_selStore; } @@ -226,10 +230,8 @@ bool wxVListBox::DoSetCurrent(int current) { // it is, indeed, only partly visible, so scroll it into view to // make it entirely visible - if ( (size_t)m_current == GetLastVisibleLine() ) - { - ScrollToLine(m_current); - } + while ( (size_t)m_current == GetLastVisibleLine() && + ScrollToLine(GetVisibleBegin()+1) ); // but in any case refresh it as even if it was only partly visible // before we need to redraw it entirely as its background changed @@ -247,7 +249,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); } @@ -353,14 +355,29 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxPaintDC dc(this); + // If size is larger, recalculate double buffer bitmap + wxSize clientSize = GetClientSize(); + + if ( !m_doubleBuffer || + clientSize.x > m_doubleBuffer->GetWidth() || + clientSize.y > m_doubleBuffer->GetHeight() ) + { + delete m_doubleBuffer; + m_doubleBuffer = new wxBitmap(clientSize.x+25,clientSize.y+25); + } + + wxBufferedPaintDC dc(this,*m_doubleBuffer); // the update rectangle wxRect rectUpdate = GetUpdateClientRect(); + // Fill it with background colour + dc.SetBrush(GetBackgroundColour()); + dc.Clear(); + // the bounding rectangle of the current line wxRect rectLine; - rectLine.width = GetClientSize().x; + rectLine.width = clientSize.x; // iterate over all visible lines const size_t lineMax = GetLastVisibleLine(); @@ -578,6 +595,8 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) void wxVListBox::OnLeftDown(wxMouseEvent& event) { + SetFocus(); + int item = HitTest(event.GetPosition()); if ( item != wxNOT_FOUND ) @@ -599,16 +618,42 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event) } } -void wxVListBox::OnLeftDClick(wxMouseEvent& event) +void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse) { - int item = HitTest(event.GetPosition()); + int item = HitTest(eventMouse.GetPosition()); if ( item != wxNOT_FOUND ) { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); - event.SetEventObject(this); - event.m_commandInt = item; - (void)GetEventHandler()->ProcessEvent(event); + // if item double-clicked was not yet selected, then treat + // this event as a left-click instead + if ( item == m_current ) + { + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); + event.SetEventObject(this); + event.SetInt(item); + + (void)GetEventHandler()->ProcessEvent(event); + } + else + { + OnLeftDown(eventMouse); + } + } } + +// ---------------------------------------------------------------------------- +// use the same default attributes as wxListBox +// ---------------------------------------------------------------------------- + +#include "wx/listbox.h" + +//static +wxVisualAttributes +wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant) +{ + return wxListBox::GetClassDefaultAttributes(variant); +} + +#endif