///////////////////////////////////////////////////////////////////////////////
-// Name: generic/vlbox.cpp
+// Name: src/generic/vlbox.cpp
// Purpose: implementation of wxVListBox
// Author: Vadim Zeitlin
// Modified by:
#if wxUSE_LISTBOX
+#include "wx/vlbox.h"
+
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/dcclient.h"
+ #include "wx/listbox.h"
#endif //WX_PRECOMP
-#include "wx/vlbox.h"
+#include "wx/dcbuffer.h"
#include "wx/selstore.h"
// ----------------------------------------------------------------------------
SetBackgroundColour(GetBackgroundColour());
m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+ // flicker-free drawing requires this
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+
return true;
}
{
// 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
if ( HasMultipleSelection() )
{
- Select(selection);
+ if (selection != wxNOT_FOUND)
+ Select(selection);
+ else
+ DeselectAll();
m_anchor = selection;
}
void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
{
- wxPaintDC dc(this);
+ wxSize clientSize = GetClientSize();
+
+ wxAutoBufferedPaintDC dc(this);
// the update rectangle
wxRect rectUpdate = GetUpdateClientRect();
+ // fill it with background colour
+ dc.SetBackground(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();
- for ( size_t line = GetFirstVisibleLine(); line <= lineMax; line++ )
+ const size_t lineMax = GetVisibleEnd();
+ for ( size_t line = GetFirstVisibleLine(); line < lineMax; line++ )
{
const wxCoord hLine = OnGetLineHeight(line);
break;
case WXK_PAGEDOWN:
- case WXK_NEXT:
PageDown();
current = GetFirstVisibleLine();
break;
case WXK_PAGEUP:
- case WXK_PRIOR:
if ( m_current == (int)GetFirstVisibleLine() )
{
PageUp();
int item = HitTest(eventMouse.GetPosition());
if ( item != wxNOT_FOUND )
{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
- event.SetEventObject(this);
- event.SetInt(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)