Add wxEVT_AUI_PANE_ACTIVATED event.

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

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 747d82825164302617dd0b084ee45c1e62f54fea..a4be49817cd791da694ac7de3c39fa29d2092b86 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -6,7 +6,7 @@
 // Created:     31.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     31.05.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -51,6 +51,8 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
 
     EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
     EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)
 
     EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
     EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)

+
+    EVT_SIZE(wxVListBox::OnSize)

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


@@ -58,6 +60,7 @@ END_EVENT_TABLE()
 // ============================================================================
 
 IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)
 // ============================================================================
 
 IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)

+const char wxVListBoxNameStr[] = "wxVListBox";

 
 // ----------------------------------------------------------------------------
 // wxVListBox creation
 
 // ----------------------------------------------------------------------------
 // wxVListBox creation


@@ -78,8 +81,8 @@ bool wxVListBox::Create(wxWindow *parent,
                         const wxString& name)
 {
 #ifdef __WXMSW__
                         const wxString& name)
 {
 #ifdef __WXMSW__

-       if ((style & wxBORDER_MASK) == wxDEFAULT)
-               style |= wxBORDER_THEME;
+    if ( (style & wxBORDER_MASK) == wxDEFAULT )
+        style |= wxBORDER_THEME;

 #endif
 
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
 #endif
 
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;


@@ -110,6 +113,10 @@ wxVListBox::~wxVListBox()
 
 void wxVListBox::SetItemCount(size_t count)
 {
 
 void wxVListBox::SetItemCount(size_t count)
 {

+    // don't leave the current index invalid
+    if ( m_current != wxNOT_FOUND && (size_t)m_current >= count )
+        m_current = count - 1; // also ok when count == 0 as wxNOT_FOUND == -1
+

     if ( m_selStore )
     {
         // tell the selection store that our number of items has changed
     if ( m_selStore )
     {
         // tell the selection store that our number of items has changed


@@ -131,10 +138,10 @@ bool wxVListBox::IsSelected(size_t line) const
 bool wxVListBox::Select(size_t item, bool select)
 {
     wxCHECK_MSG( m_selStore, false,
 bool wxVListBox::Select(size_t item, bool select)
 {
     wxCHECK_MSG( m_selStore, false,

-                 _T("Select() may only be used with multiselection listbox") );
+                 wxT("Select() may only be used with multiselection listbox") );

 
     wxCHECK_MSG( item < GetItemCount(), false,
 
     wxCHECK_MSG( item < GetItemCount(), false,

-                 _T("Select(): invalid item index") );
+                 wxT("Select(): invalid item index") );

 
     bool changed = m_selStore->SelectItem(item, select);
     if ( changed )
 
     bool changed = m_selStore->SelectItem(item, select);
     if ( changed )


@@ -151,7 +158,7 @@ bool wxVListBox::Select(size_t item, bool select)
 bool wxVListBox::SelectRange(size_t from, size_t to)
 {
     wxCHECK_MSG( m_selStore, false,
 bool wxVListBox::SelectRange(size_t from, size_t to)
 {
     wxCHECK_MSG( m_selStore, false,

-                 _T("SelectRange() may only be used with multiselection listbox") );
+                 wxT("SelectRange() may only be used with multiselection listbox") );

 
     // make sure items are in correct order
     if ( from > to )
 
     // make sure items are in correct order
     if ( from > to )


@@ -162,7 +169,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
     }
 
     wxCHECK_MSG( to < GetItemCount(), false,
     }
 
     wxCHECK_MSG( to < GetItemCount(), false,

-                    _T("SelectRange(): invalid item index") );
+                    wxT("SelectRange(): invalid item index") );

 
     wxArrayInt changed;
     if ( !m_selStore->SelectRange(from, to, true, &changed) )
 
     wxArrayInt changed;
     if ( !m_selStore->SelectRange(from, to, true, &changed) )


@@ -194,7 +201,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
 bool wxVListBox::DoSelectAll(bool select)
 {
     wxCHECK_MSG( m_selStore, false,
 bool wxVListBox::DoSelectAll(bool select)
 {
     wxCHECK_MSG( m_selStore, false,

-                 _T("SelectAll may only be used with multiselection listbox") );
+                 wxT("SelectAll may only be used with multiselection listbox") );

 
     size_t count = GetItemCount();
     if ( count )
 
     size_t count = GetItemCount();
     if ( count )


@@ -217,7 +224,7 @@ bool wxVListBox::DoSetCurrent(int current)
 {
     wxASSERT_MSG( current == wxNOT_FOUND ||
                     (current >= 0 && (size_t)current < GetItemCount()),
 {
     wxASSERT_MSG( current == wxNOT_FOUND ||
                     (current >= 0 && (size_t)current < GetItemCount()),

-                  _T("wxVListBox::DoSetCurrent(): invalid item index") );
+                  wxT("wxVListBox::DoSetCurrent(): invalid item index") );

 
     if ( current == m_current )
     {
 
     if ( current == m_current )
     {


@@ -242,7 +249,10 @@ 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

+            // BUT scrolling down when m_current is first visible makes it
+            // completely hidden, so that is even worse

             while ( (size_t)m_current + 1 == GetVisibleRowsEnd() &&
             while ( (size_t)m_current + 1 == GetVisibleRowsEnd() &&

+                    (size_t)m_current != GetVisibleRowsBegin() &&

                     ScrollToRow(GetVisibleBegin() + 1) ) ;
 
             // but in any case refresh it as even if it was only partly visible
                     ScrollToRow(GetVisibleBegin() + 1) ) ;
 
             // but in any case refresh it as even if it was only partly visible


@@ -254,15 +264,19 @@ bool wxVListBox::DoSetCurrent(int current)
     return true;
 }
 
     return true;
 }
 

+void wxVListBox::InitEvent(wxCommandEvent& event, int n)
+{
+    event.SetEventObject(this);
+    event.SetInt(n);
+}
+

 void wxVListBox::SendSelectedEvent()
 {
     wxASSERT_MSG( m_current != wxNOT_FOUND,
 void wxVListBox::SendSelectedEvent()
 {
     wxASSERT_MSG( m_current != wxNOT_FOUND,

-                    _T("SendSelectedEvent() shouldn't be called") );
+                    wxT("SendSelectedEvent() shouldn't be called") );

 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());

-    event.SetEventObject(this);
-    event.SetInt(m_current);
-
+    InitEvent(event, m_current);

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


@@ -270,7 +284,7 @@ void wxVListBox::SetSelection(int selection)
 {
     wxCHECK_RET( selection == wxNOT_FOUND ||
                   (selection >= 0 && (size_t)selection < GetItemCount()),
 {
     wxCHECK_RET( selection == wxNOT_FOUND ||
                   (selection >= 0 && (size_t)selection < GetItemCount()),

-                  _T("wxVListBox::SetSelection(): invalid item index") );
+                  wxT("wxVListBox::SetSelection(): invalid item index") );

 
     if ( HasMultipleSelection() )
     {
 
     if ( HasMultipleSelection() )
     {


@@ -300,7 +314,7 @@ int wxVListBox::GetFirstSelected(unsigned long& cookie) const
 int wxVListBox::GetNextSelected(unsigned long& cookie) const
 {
     wxCHECK_MSG( m_selStore, wxNOT_FOUND,
 int wxVListBox::GetNextSelected(unsigned long& cookie) const
 {
     wxCHECK_MSG( m_selStore, wxNOT_FOUND,

-                  _T("GetFirst/NextSelected() may only be used with multiselection listboxes") );
+                  wxT("GetFirst/NextSelected() may only be used with multiselection listboxes") );

 
     while ( cookie < GetItemCount() )
     {
 
     while ( cookie < GetItemCount() )
     {


@@ -321,6 +335,31 @@ void wxVListBox::RefreshSelected()
     }
 }
 
     }
 }
 

+wxRect wxVListBox::GetItemRect(size_t n) const
+{
+    wxRect itemrect;
+
+    // check that this item is visible
+    const size_t lineMax = GetVisibleEnd();
+    if ( n >= lineMax )
+        return itemrect;
+    size_t line = GetVisibleBegin();
+    if ( n < line )
+        return itemrect;
+
+    while ( line <= n )
+    {
+        itemrect.y += itemrect.height;
+        itemrect.height = OnGetRowHeight(line);
+
+        line++;
+    }
+
+    itemrect.width = GetClientSize().x;
+
+    return itemrect;
+}
+

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


@@ -355,40 +394,51 @@ 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 ( m_colBgSel.IsOk() )
+    if ( !col.IsOk() )
+        return false;
+
+    // we need to render selected and current items differently
+    const bool isSelected = IsSelected(n),
+               isCurrent = IsCurrent(n);
+    if ( isSelected || isCurrent )

     {
     {

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

         {
         {

-            if ( isSelected )
-            {
-                dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
-            }
-            else // !selected
-            {
-                dc.SetBrush(*wxTRANSPARENT_BRUSH);
-            }
-            dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
-            dc.DrawRectangle(rect);
+            dc.SetBrush(wxBrush(col, wxBRUSHSTYLE_SOLID));
+        }
+        else // !selected
+        {
+            dc.SetBrush(*wxTRANSPARENT_BRUSH);

         }
         }

-        //else: do nothing for the normal items
+        dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
+        dc.DrawRectangle(rect);

     }
     }

-    else // use wxRendererNative for a more native look&feel:
+    //else: do nothing for the normal items
+
+    return true;
+}
+
+void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
+{
+    // use wxRendererNative for more native look unless we use custom bg colour
+    if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) )

     {
         int flags = 0;
         if ( IsSelected(n) )
             flags |= wxCONTROL_SELECTED;
         if ( IsCurrent(n) )
             flags |= wxCONTROL_CURRENT;
     {
         int flags = 0;
         if ( IsSelected(n) )
             flags |= wxCONTROL_SELECTED;
         if ( IsCurrent(n) )
             flags |= wxCONTROL_CURRENT;

-        if ( wxWindow::FindFocus() == wx_const_cast(wxVListBox*, this) )
+        if ( wxWindow::FindFocus() == const_cast<wxVListBox*>(this) )

             flags |= wxCONTROL_FOCUSED;
 
         wxRendererNative::Get().DrawItemSelectionRect(
             flags |= wxCONTROL_FOCUSED;
 
         wxRendererNative::Get().DrawItemSelectionRect(

-            wx_const_cast(wxVListBox *, this), dc, rect, flags);
+            const_cast<wxVListBox *>(this), dc, rect, flags);

     }
 }
 
     }
 }
 


@@ -454,6 +504,11 @@ void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event))
     RefreshSelected();
 }
 
     RefreshSelected();
 }
 

+void wxVListBox::OnSize(wxSizeEvent& event)
+{
+    UpdateScrollbar();
+    event.Skip();
+}

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


@@ -553,14 +608,17 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
     switch ( event.GetKeyCode() )
     {
         case WXK_HOME:
     switch ( event.GetKeyCode() )
     {
         case WXK_HOME:

+        case WXK_NUMPAD_HOME:

             current = 0;
             break;
 
         case WXK_END:
             current = 0;
             break;
 
         case WXK_END:

+        case WXK_NUMPAD_END:

             current = GetRowCount() - 1;
             break;
 
         case WXK_DOWN:
             current = GetRowCount() - 1;
             break;
 
         case WXK_DOWN:

+        case WXK_NUMPAD_DOWN:

             if ( m_current == (int)GetRowCount() - 1 )
                 return;
 
             if ( m_current == (int)GetRowCount() - 1 )
                 return;
 


@@ -568,6 +626,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_UP:
             break;
 
         case WXK_UP:

+        case WXK_NUMPAD_UP:

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


@@ -577,11 +636,13 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_PAGEDOWN:
             break;
 
         case WXK_PAGEDOWN:

+        case WXK_NUMPAD_PAGEDOWN:

             PageDown();
             current = GetVisibleBegin();
             break;
 
         case WXK_PAGEUP:
             PageDown();
             current = GetVisibleBegin();
             break;
 
         case WXK_PAGEUP:

+        case WXK_NUMPAD_PAGEUP:

             if ( m_current == (int)GetVisibleBegin() )
             {
                 PageUp();
             if ( m_current == (int)GetVisibleBegin() )
             {
                 PageUp();


@@ -602,13 +663,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:


@@ -666,9 +721,7 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
         if ( item == m_current )
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
         if ( item == m_current )
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());

-            event.SetEventObject(this);
-            event.SetInt(item);
-
+            InitEvent(event, item);

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