#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"
// ----------------------------------------------------------------------------
// implementation
// ============================================================================
+IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)
+
// ----------------------------------------------------------------------------
// wxVListBox creation
// ----------------------------------------------------------------------------
m_current =
m_anchor = wxNOT_FOUND;
m_selStore = NULL;
+ m_doubleBuffer = NULL;
}
bool wxVListBox::Create(wxWindow *parent,
long style,
const wxString& name)
{
+ 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));
+ // 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;
}
{
// 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
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
event.SetEventObject(this);
- event.m_commandInt = m_current;
+ event.SetInt(m_current);
(void)GetEventHandler()->ProcessEvent(event);
}
{
}
-void wxVListBox::OnPaint(wxPaintEvent& event)
+void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
{
- wxPaintDC dc(this);
+ // we need to render selected and current items differently
+ const bool isSelected = IsSelected(n),
+ isCurrent = IsCurrent(n);
+ if ( isSelected || isCurrent )
+ {
+ if ( isSelected )
+ {
+ dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
+ }
+ else // !selected
+ {
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ }
+
+ dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
+
+ dc.DrawRectangle(rect);
+ }
+ //else: do nothing for the normal items
+}
+
+void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+ // 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();
// don't allow drawing outside of the lines rectangle
wxDCClipper clip(dc, rectLine);
- // we need to render selected and current items differently
- const bool isSelected = IsSelected(line);
- if ( isSelected || IsCurrent(line) )
- {
- if ( isSelected )
- {
- dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
- }
- else // !selected
- {
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- }
-
- dc.SetPen(*(IsCurrent(line) ? wxBLACK_PEN : wxTRANSPARENT_PEN));
-
- dc.DrawRectangle(rectLine);
- }
-
wxRect rect = rectLine;
+ OnDrawBackground(dc, rect, line);
+
OnDrawSeparator(dc, rect, line);
rect.Deflate(m_ptMargins.x, m_ptMargins.y);
// 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:
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;
}
void wxVListBox::OnLeftDown(wxMouseEvent& event)
{
+ SetFocus();
+
int item = HitTest(event.GetPosition());
if ( item != wxNOT_FOUND )
}
}
-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
projects / wxWidgets.git / blobdiff