replaced all int/size_t indices in wxControlWithItems API with unsigned int (committi...

[wxWidgets.git] / src / generic / vlbox.cpp

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 903e1878273abc4c7b73c00d4578e9cc0b6adf61..1c1f33174e1394516ffc1dfa3e33c878e0c42ea2 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -24,12 +24,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 
 #include "wx/vlbox.h"
 #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"
 
 // ----------------------------------------------------------------------------
 #include "wx/selstore.h"
 
 // ----------------------------------------------------------------------------


@@ -59,6 +62,7 @@ void wxVListBox::Init()
     m_current =
     m_anchor = wxNOT_FOUND;
     m_selStore = NULL;
     m_current =
     m_anchor = wxNOT_FOUND;
     m_selStore = NULL;

+    m_doubleBuffer = NULL;

 }
 
 bool wxVListBox::Create(wxWindow *parent,
 }
 
 bool wxVListBox::Create(wxWindow *parent,


@@ -68,29 +72,27 @@ bool wxVListBox::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         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;
 
     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);
 
     m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 

-    m_bestSize = GetSize();
-    
+    // flicker-free drawing requires this
+    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+

     return true;
 }
 
 wxVListBox::~wxVListBox()
 {
     return true;
 }
 
 wxVListBox::~wxVListBox()
 {

+    delete m_doubleBuffer;    

     delete m_selStore;
 }
 
     delete m_selStore;
 }
 


@@ -228,10 +230,8 @@ bool wxVListBox::DoSetCurrent(int current)
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible
         {
             // 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
 
             // 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


@@ -249,7 +249,7 @@ void wxVListBox::SendSelectedEvent()
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
     event.SetEventObject(this);
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
     event.SetEventObject(this);

-    event.m_commandInt = m_current;
+    event.SetInt(m_current);

 
     (void)GetEventHandler()->ProcessEvent(event);
 }
 
     (void)GetEventHandler()->ProcessEvent(event);
 }


@@ -355,14 +355,29 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
 
 void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 
 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();
 
 
     // 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;
     // 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();
 
     // iterate over all visible lines
     const size_t lineMax = GetLastVisibleLine();


@@ -580,6 +595,8 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
 
 void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {
 
 void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {

+    SetFocus();
+

     int item = HitTest(event.GetPosition());
 
     if ( item != wxNOT_FOUND )
     int item = HitTest(event.GetPosition());
 
     if ( item != wxNOT_FOUND )


@@ -601,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 )
     {
     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