reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 1c1f33174e1394516ffc1dfa3e33c878e0c42ea2..4d2722220598fc0979ba576bd785844f7847dbd0 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/vlbox.cpp
+// Name:        src/generic/vlbox.cpp

 // Purpose:     implementation of wxVListBox
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxVListBox
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,14 +26,17 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/vlbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"

+    #include "wx/listbox.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/vlbox.h"

 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"

+#include "wx/renderer.h"

 
 // ----------------------------------------------------------------------------
 // event tables
 
 // ----------------------------------------------------------------------------
 // event tables


@@ -45,6 +48,9 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
     EVT_KEY_DOWN(wxVListBox::OnKeyDown)
     EVT_LEFT_DOWN(wxVListBox::OnLeftDown)
     EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick)
     EVT_KEY_DOWN(wxVListBox::OnKeyDown)
     EVT_LEFT_DOWN(wxVListBox::OnLeftDown)
     EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick)

+
+    EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
+    EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -62,7 +68,6 @@ 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,


@@ -72,6 +77,11 @@ bool wxVListBox::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

+#ifdef __WXMSW__
+       if ((style & wxBORDER_MASK) == wxDEFAULT)
+               style |= wxBORDER_THEME;
+#endif
+

     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
     if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) )
         return false;
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
     if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) )
         return false;


@@ -82,7 +92,10 @@ bool wxVListBox::Create(wxWindow *parent,
     // make sure the native widget has the right colour since we do
     // transparent drawing by default
     SetBackgroundColour(GetBackgroundColour());
     // 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);
+
+    // leave m_colBgSel in an invalid state: it means for OnDrawBackground()
+    // to use wxRendererNative instead of painting selection bg ourselves
+    m_colBgSel = wxNullColour;

 
     // flicker-free drawing requires this
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
     // flicker-free drawing requires this
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);


@@ -92,7 +105,6 @@ bool wxVListBox::Create(wxWindow *parent,
 
 wxVListBox::~wxVListBox()
 {
 
 wxVListBox::~wxVListBox()
 {

-    delete m_doubleBuffer;    

     delete m_selStore;
 }
 
     delete m_selStore;
 }
 


@@ -104,7 +116,7 @@ void wxVListBox::SetItemCount(size_t count)
         m_selStore->SetItemCount(count);
     }
 
         m_selStore->SetItemCount(count);
     }
 

-    SetLineCount(count);
+    SetRowCount(count);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -128,7 +140,7 @@ bool wxVListBox::Select(size_t item, bool select)
     if ( changed )
     {
         // selection really changed
     if ( changed )
     {
         // selection really changed

-        RefreshLine(item);
+        RefreshRow(item);

     }
 
     DoSetCurrent(item);
     }
 
     DoSetCurrent(item);


@@ -157,7 +169,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
     {
         // too many items have changed, we didn't record them in changed array
         // so we have no choice but to refresh everything between from and to
     {
         // too many items have changed, we didn't record them in changed array
         // so we have no choice but to refresh everything between from and to

-        RefreshLines(from, to);
+        RefreshRows(from, to);

     }
     else // we've got the indices of the changed items
     {
     }
     else // we've got the indices of the changed items
     {


@@ -171,7 +183,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
         // refresh just the lines which have really changed
         for ( size_t n = 0; n < count; n++ )
         {
         // refresh just the lines which have really changed
         for ( size_t n = 0; n < count; n++ )
         {

-            RefreshLine(changed[n]);
+            RefreshRow(changed[n]);

         }
     }
 
         }
     }
 


@@ -214,7 +226,7 @@ bool wxVListBox::DoSetCurrent(int current)
     }
 
     if ( m_current != wxNOT_FOUND )
     }
 
     if ( m_current != wxNOT_FOUND )

-        RefreshLine(m_current);
+        RefreshRow(m_current);

 
     m_current = current;
 
 
     m_current = current;
 


@@ -224,18 +236,18 @@ bool wxVListBox::DoSetCurrent(int current)
         // don't need to refresh it -- it will be redrawn anyhow
         if ( !IsVisible(m_current) )
         {
         // don't need to refresh it -- it will be redrawn anyhow
         if ( !IsVisible(m_current) )
         {

-            ScrollToLine(m_current);
+            ScrollToRow(m_current);

         }
         else // line is at least partly visible
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible
         }
         else // line is at least partly visible
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible

-            while ( (size_t)m_current == GetLastVisibleLine() &&
-                    ScrollToLine(GetVisibleBegin()+1) );
+            while ( (size_t)m_current + 1 == GetVisibleRowsEnd() &&
+                    ScrollToRow(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

-            RefreshLine(m_current);
+            RefreshRow(m_current);

         }
     }
 
         }
     }
 


@@ -262,7 +274,10 @@ void wxVListBox::SetSelection(int selection)
 
     if ( HasMultipleSelection() )
     {
 
     if ( HasMultipleSelection() )
     {

-        Select(selection);
+        if (selection != wxNOT_FOUND)
+            Select(selection);
+        else
+            DeselectAll();

         m_anchor = selection;
     }
 
         m_anchor = selection;
     }
 


@@ -296,6 +311,16 @@ int wxVListBox::GetNextSelected(unsigned long& cookie) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

+void wxVListBox::RefreshSelected()
+{
+    // only refresh those items which are currently visible and selected:
+    for ( size_t n = GetVisibleBegin(), end = GetVisibleEnd(); n < end; n++ )
+    {
+        if ( IsSelected(n) )
+            RefreshRow(n);
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------


@@ -319,7 +344,7 @@ void wxVListBox::SetSelectionBackground(const wxColour& col)
 // wxVListBox painting
 // ----------------------------------------------------------------------------
 
 // wxVListBox painting
 // ----------------------------------------------------------------------------
 

-wxCoord wxVListBox::OnGetLineHeight(size_t line) const
+wxCoord wxVListBox::OnGetRowHeight(size_t line) const

 {
     return OnMeasureItem(line) + 2*m_ptMargins.y;
 }
 {
     return OnMeasureItem(line) + 2*m_ptMargins.y;
 }


@@ -330,8 +355,15 @@ void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc),
 {
 }
 
 {
 }
 

-void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
+bool
+wxVListBox::DoDrawSolidBackground(const wxColour& col,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  size_t n) const

 {
 {

+    if ( !col.IsOk() )
+        return false;
+

     // we need to render selected and current items differently
     const bool isSelected = IsSelected(n),
                isCurrent = IsCurrent(n);
     // we need to render selected and current items differently
     const bool isSelected = IsSelected(n),
                isCurrent = IsCurrent(n);


@@ -339,61 +371,70 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
     {
         if ( isSelected )
         {
     {
         if ( isSelected )
         {

-            dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
+            dc.SetBrush(wxBrush(col, wxSOLID));

         }
         else // !selected
         {
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
         }
         }
         else // !selected
         {
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
         }

-

         dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
         dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));

-

         dc.DrawRectangle(rect);
     }
     //else: do nothing for the normal items
         dc.DrawRectangle(rect);
     }
     //else: do nothing for the normal items

+
+    return true;

 }
 
 }
 

-void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const

 {
 {

-    // If size is larger, recalculate double buffer bitmap
-    wxSize clientSize = GetClientSize();
-
-    if ( !m_doubleBuffer ||
-         clientSize.x > m_doubleBuffer->GetWidth() ||
-         clientSize.y > m_doubleBuffer->GetHeight() )
+    // use wxRendererNative for more native look unless we use custom bg colour
+    if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) )

     {
     {

-        delete m_doubleBuffer;
-        m_doubleBuffer = new wxBitmap(clientSize.x+25,clientSize.y+25);
+        int flags = 0;
+        if ( IsSelected(n) )
+            flags |= wxCONTROL_SELECTED;
+        if ( IsCurrent(n) )
+            flags |= wxCONTROL_CURRENT;
+        if ( wxWindow::FindFocus() == wx_const_cast(wxVListBox*, this) )
+            flags |= wxCONTROL_FOCUSED;
+
+        wxRendererNative::Get().DrawItemSelectionRect(
+            wx_const_cast(wxVListBox *, this), dc, rect, flags);

     }
     }

+}

 
 

-    wxBufferedPaintDC dc(this,*m_doubleBuffer);
+void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxSize clientSize = GetClientSize();
+
+    wxAutoBufferedPaintDC dc(this);

 
     // the update rectangle
     wxRect rectUpdate = GetUpdateClientRect();
 
 
     // the update rectangle
     wxRect rectUpdate = GetUpdateClientRect();
 

-    // Fill it with background colour
-    dc.SetBrush(GetBackgroundColour());
+    // fill it with background colour
+    dc.SetBackground(GetBackgroundColour());

     dc.Clear();
 
     // the bounding rectangle of the current line
     dc.Clear();
 
     // the bounding rectangle of the current line

-    wxRect rectLine;
-    rectLine.width = clientSize.x;
+    wxRect rectRow;
+    rectRow.width = clientSize.x;

 
     // iterate over all visible lines
 
     // 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 = GetVisibleBegin(); line < lineMax; line++ )

     {
     {

-        const wxCoord hLine = OnGetLineHeight(line);
+        const wxCoord hRow = OnGetRowHeight(line);

 
 

-        rectLine.height = hLine;
+        rectRow.height = hRow;

 
         // and draw the ones which intersect the update rect
 
         // and draw the ones which intersect the update rect

-        if ( rectLine.Intersects(rectUpdate) )
+        if ( rectRow.Intersects(rectUpdate) )

         {
             // don't allow drawing outside of the lines rectangle
         {
             // don't allow drawing outside of the lines rectangle

-            wxDCClipper clip(dc, rectLine);
+            wxDCClipper clip(dc, rectRow);

 
 

-            wxRect rect = rectLine;
+            wxRect rect = rectRow;

             OnDrawBackground(dc, rect, line);
 
             OnDrawSeparator(dc, rect, line);
             OnDrawBackground(dc, rect, line);
 
             OnDrawSeparator(dc, rect, line);


@@ -403,7 +444,7 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
         }
         else // no intersection
         {
         }
         else // no intersection
         {

-            if ( rectLine.GetTop() > rectUpdate.GetBottom() )
+            if ( rectRow.GetTop() > rectUpdate.GetBottom() )

             {
                 // we are already below the update rect, no need to continue
                 // further
             {
                 // we are already below the update rect, no need to continue
                 // further


@@ -412,10 +453,19 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
             //else: the next line may intersect the update rect
         }
 
             //else: the next line may intersect the update rect
         }
 

-        rectLine.y += hLine;
+        rectRow.y += hRow;

     }
 }
 
     }
 }
 

+void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event))
+{
+    // we need to repaint the selection when we get the focus since
+    // wxRendererNative in general draws the focused selection differently
+    // from the unfocused selection (see OnDrawItem):
+    RefreshSelected();
+}
+
+

 // ============================================================================
 // wxVListBox keyboard/mouse handling
 // ============================================================================
 // ============================================================================
 // wxVListBox keyboard/mouse handling
 // ============================================================================


@@ -518,11 +568,11 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_END:
             break;
 
         case WXK_END:

-            current = GetLineCount() - 1;
+            current = GetRowCount() - 1;

             break;
 
         case WXK_DOWN:
             break;
 
         case WXK_DOWN:

-            if ( m_current == (int)GetLineCount() - 1 )
+            if ( m_current == (int)GetRowCount() - 1 )

                 return;
 
             current = m_current + 1;
                 return;
 
             current = m_current + 1;


@@ -530,7 +580,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
 
         case WXK_UP:
             if ( m_current == wxNOT_FOUND )
 
         case WXK_UP:
             if ( m_current == wxNOT_FOUND )

-                current = GetLineCount() - 1;
+                current = GetRowCount() - 1;

             else if ( m_current != 0 )
                 current = m_current - 1;
             else // m_current == 0
             else if ( m_current != 0 )
                 current = m_current - 1;
             else // m_current == 0


@@ -538,19 +588,17 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN:

-        case WXK_NEXT:

             PageDown();
             PageDown();

-            current = GetFirstVisibleLine();
+            current = GetVisibleBegin();

             break;
 
         case WXK_PAGEUP:
             break;
 
         case WXK_PAGEUP:

-        case WXK_PRIOR:
-            if ( m_current == (int)GetFirstVisibleLine() )
+            if ( m_current == (int)GetVisibleBegin() )

             {
                 PageUp();
             }
 
             {
                 PageUp();
             }
 

-            current = GetFirstVisibleLine();
+            current = GetVisibleBegin();

             break;
 
         case WXK_SPACE:
             break;
 
         case WXK_SPACE:


@@ -565,13 +613,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
         case WXK_TAB:
             // Since we are using wxWANTS_CHARS we need to send navigation
             // events for the tabs on MSW
         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);
-            }
+            HandleAsNavigationKey(event);

             // fall through to default
 #endif
         default:
             // fall through to default
 #endif
         default:


@@ -597,7 +639,7 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {
     SetFocus();
 
 {
     SetFocus();
 

-    int item = HitTest(event.GetPosition());
+    int item = VirtualHitTest(event.GetPosition().y);

 
     if ( item != wxNOT_FOUND )
     {
 
     if ( item != wxNOT_FOUND )
     {


@@ -620,7 +662,7 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event)
 
 void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 {
 
 void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 {

-    int item = HitTest(eventMouse.GetPosition());
+    int item = VirtualHitTest(eventMouse.GetPosition().y);

     if ( item != wxNOT_FOUND )
     {
 
     if ( item != wxNOT_FOUND )
     {
 


@@ -638,7 +680,7 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
         {
             OnLeftDown(eventMouse);
         }
         {
             OnLeftDown(eventMouse);
         }

-    
+

     }
 }
 
     }
 }
 


@@ -647,8 +689,6 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 

-#include "wx/listbox.h"
-

 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)