Reverted fragment

[wxWidgets.git] / src / univ / listbox.cpp

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 37fe1fbd72fef07519e04321bd44838de2478c48..099d70f8e396950cf28969f15a98450716356623 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univlistbox.h"
 #endif
 
     #pragma implementation "univlistbox.h"
 #endif
 


@@ -49,8 +49,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
     EVT_SIZE(wxListBox::OnSize)
 
 BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
     EVT_SIZE(wxListBox::OnSize)

-
-    EVT_IDLE(wxListBox::OnIdle)

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------


@@ -65,6 +63,7 @@ void wxListBox::Init()
     m_maxWidth = 0;
     m_scrollRangeY = 0;
     m_maxWidthItem = -1;
     m_maxWidth = 0;
     m_scrollRangeY = 0;
     m_maxWidthItem = -1;

+    m_strings = NULL;

 
     // no items hence no current item
     m_current = -1;
 
     // no items hence no current item
     m_current = -1;


@@ -101,13 +100,22 @@ bool wxListBox::Create(wxWindow *parent,
     if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) )
         style |= wxLB_SINGLE;
 
     if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) )
         style |= wxLB_SINGLE;
 

-    if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
+#if wxUSE_TWO_WINDOWS
+    style |=  wxVSCROLL|wxHSCROLL;
+    if ((style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+#endif
+
+    if ( !wxControl::Create(parent, id, pos, size, style, 
+                            validator, name) )

         return FALSE;
 
     SetWindow(this);
 
     if ( style & wxLB_SORT )
         return FALSE;
 
     SetWindow(this);
 
     if ( style & wxLB_SORT )

-        m_strings = wxArrayString(TRUE /* auto sort */);
+        m_stringsSorted = new wxSortedArrayString;
+    else
+        m_strings = new wxArrayString;

 
     Set(n, choices);
 
 
     Set(n, choices);
 


@@ -120,6 +128,15 @@ bool wxListBox::Create(wxWindow *parent,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

+    // call this just to free the client data -- and avoid leaking memory
+    DoClear();
+
+    if ( IsSorted() )
+        delete m_stringsSorted;
+    else
+        delete m_strings;
+
+    m_strings = NULL;

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


@@ -128,7 +145,18 @@ wxListBox::~wxListBox()
 
 int wxListBox::DoAppend(const wxString& item)
 {
 
 int wxListBox::DoAppend(const wxString& item)
 {

-    size_t index = m_strings.Add(item);
+    size_t index;
+
+    if ( IsSorted() )
+    {
+        index = m_stringsSorted->Add(item);
+    }
+    else
+    {
+        index = m_strings->GetCount();
+        m_strings->Add(item);
+    }
+

     m_itemsClientData.Insert(NULL, index);
 
     m_updateScrollbarY = TRUE;
     m_itemsClientData.Insert(NULL, index);
 
     m_updateScrollbarY = TRUE;


@@ -160,7 +188,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_strings.Insert(items[n], pos + n);
+        m_strings->Insert(items[n], pos + n);

         m_itemsClientData.Insert(NULL, pos + n);
     }
 
         m_itemsClientData.Insert(NULL, pos + n);
     }
 


@@ -185,11 +213,22 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
     if ( !count )
         return;
 
     if ( !count )
         return;
 

-    m_strings.Alloc(count);
+    m_strings->Alloc(count);

     m_itemsClientData.Alloc(count);
     for ( size_t n = 0; n < count; n++ )
     {
     m_itemsClientData.Alloc(count);
     for ( size_t n = 0; n < count; n++ )
     {

-        size_t index = m_strings.Add(items[n]);
+        size_t index;
+
+        if ( IsSorted() )
+        {
+            index = m_stringsSorted->Add(items[n]);
+        }
+        else
+        {
+            index = m_strings->GetCount();
+            m_strings->Add(items[n]);
+        }
+

         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 
         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 


@@ -205,7 +244,7 @@ void wxListBox::SetString(int n, const wxString& s)
         // we need to update m_maxWidth as changing the string may cause the
         // horz scrollbar [dis]appear
         wxCoord width;
         // we need to update m_maxWidth as changing the string may cause the
         // horz scrollbar [dis]appear
         wxCoord width;

-        m_strings[n] = s;
+        (*m_strings)[n] = s;

         GetTextExtent(s, &width, NULL);
 
         // it might have increased if the new string is long
         GetTextExtent(s, &width, NULL);
 
         // it might have increased if the new string is long


@@ -223,7 +262,7 @@ void wxListBox::SetString(int n, const wxString& s)
     }
     else // no horz scrollbar
     {
     }
     else // no horz scrollbar
     {

-        m_strings[n] = s;
+        (*m_strings)[n] = s;

     }
 
     RefreshItem(n);
     }
 
     RefreshItem(n);


@@ -235,7 +274,7 @@ void wxListBox::SetString(int n, const wxString& s)
 
 void wxListBox::DoClear()
 {
 
 void wxListBox::DoClear()
 {

-    m_strings.Clear();
+    m_strings->Clear();

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -265,13 +304,14 @@ void wxListBox::Clear()
 
 void wxListBox::Delete(int n)
 {
 
 void wxListBox::Delete(int n)
 {

-    wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") );
+    wxCHECK_RET( n >= 0 && n < GetCount(),
+                 _T("invalid index in wxListBox::Delete") );

 
     // do it before removing the index as otherwise the last item will not be
     // refreshed (as GetCount() will be decremented)
     RefreshFromItemToEnd(n);
 
 
     // do it before removing the index as otherwise the last item will not be
     // refreshed (as GetCount() will be decremented)
     RefreshFromItemToEnd(n);
 

-    m_strings.RemoveAt(n);
+    m_strings->RemoveAt(n);

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -591,7 +631,7 @@ void wxListBox::UpdateItems()
     }
 }
 
     }
 }
 

-void wxListBox::OnIdle(wxIdleEvent& event)
+void wxListBox::OnInternalIdle()

 {
     if ( m_updateScrollbarY || m_updateScrollbarX )
     {
 {
     if ( m_updateScrollbarY || m_updateScrollbarX )
     {


@@ -614,8 +654,7 @@ void wxListBox::OnIdle(wxIdleEvent& event)
 
         m_updateCount = 0;
     }
 
         m_updateCount = 0;
     }

-
-    event.Skip();
+    wxListBoxBase::OnInternalIdle();

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


@@ -645,7 +684,7 @@ void wxListBox::DoDraw(wxControlRenderer *renderer)
     wxCoord lineHeight = GetLineHeight();
     size_t itemFirst = yTop / lineHeight,
            itemLast = (yBottom + lineHeight - 1) / lineHeight,
     wxCoord lineHeight = GetLineHeight();
     size_t itemFirst = yTop / lineHeight,
            itemLast = (yBottom + lineHeight - 1) / lineHeight,

-           itemMax = m_strings.GetCount();
+           itemMax = m_strings->GetCount();

 
     if ( itemFirst >= itemMax )
         return;
 
     if ( itemFirst >= itemMax )
         return;


@@ -714,10 +753,10 @@ wxCoord wxListBox::GetMaxWidth() const
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;

-        size_t count = m_strings.GetCount();
+        size_t count = m_strings->GetCount();

         for ( size_t n = 0; n < count; n++ )
         {
         for ( size_t n = 0; n < count; n++ )
         {

-            GetTextExtent(m_strings[n], &width, NULL);
+            GetTextExtent((*m_strings)[n], &width, NULL);

             if ( width > m_maxWidth )
             {
                 self->m_maxWidth = width;
             if ( width > m_maxWidth )
             {
                 self->m_maxWidth = width;


@@ -763,7 +802,7 @@ void wxListBox::DoSetSize(int x, int y,
         height = ((height - hBorders + hLine - 1) / hLine)*hLine + hBorders;
     }
 
         height = ((height - hBorders + hLine - 1) / hLine)*hLine + hBorders;
     }
 

-    wxListBoxBase::DoSetSize(x, y, width, height);
+    wxListBoxBase::DoSetSize(x, y, width, height, sizeFlags);

 }
 
 wxSize wxListBox::DoGetBestClientSize() const
 }
 
 wxSize wxListBox::DoGetBestClientSize() const


@@ -771,11 +810,11 @@ wxSize wxListBox::DoGetBestClientSize() const
     wxCoord width = 0,
             height = 0;
 
     wxCoord width = 0,
             height = 0;
 

-    size_t count = m_strings.GetCount();
+    size_t count = m_strings->GetCount();

     for ( size_t n = 0; n < count; n++ )
     {
         wxCoord w,h;
     for ( size_t n = 0; n < count; n++ )
     {
         wxCoord w,h;

-        GetTextExtent(m_strings[n], &w, &h);
+        GetTextExtent((*m_strings)[n], &w, &h);

 
         if ( w > width )
             width = w;
 
         if ( w > width )
             width = w;


@@ -805,11 +844,6 @@ wxSize wxListBox::DoGetBestClientSize() const
 
 bool wxListBox::SendEvent(wxEventType type, int item)
 {
 
 bool wxListBox::SendEvent(wxEventType type, int item)
 {

-    // don't generate select events while the mouse is captured, we will only
-    // send them once it is released
-    if ( (type == wxEVT_COMMAND_LISTBOX_SELECTED) && (GetCapture() == this) )
-        return FALSE;
-

     wxCommandEvent event(type, m_windowId);
     event.SetEventObject(this);
 
     wxCommandEvent event(type, m_windowId);
     event.SetEventObject(this);
 


@@ -888,7 +922,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
     // loop over all items in the listbox
     for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
     {
     // loop over all items in the listbox
     for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
     {

-        if ( wxStrnicmp(m_strings[item], prefix, len) == 0 )
+        if ( wxStrnicmp((*m_strings)[item], prefix, len) == 0 )

         {
             SetCurrentItem(item);
 
         {
             SetCurrentItem(item);
 


@@ -1005,7 +1039,7 @@ void wxListBox::ExtendSelection(int itemTo)
     }
 }
 
     }
 }
 

-void wxListBox::Select(bool sel, int item)
+void wxListBox::DoSelect(int item, bool sel)

 {
     if ( item != -1 )
     {
 {
     if ( item != -1 )
     {


@@ -1025,7 +1059,7 @@ void wxListBox::Select(bool sel, int item)
 
 void wxListBox::SelectAndNotify(int item)
 {
 
 void wxListBox::SelectAndNotify(int item)
 {

-    Select(TRUE, item);
+    DoSelect(item);

 
     SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 }
 
     SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 }


@@ -1044,7 +1078,7 @@ void wxListBox::Activate(int item)
 
     if ( item != -1 )
     {
 
     if ( item != -1 )
     {

-        Select(TRUE, item);
+        DoSelect(item);

 
         SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
     }
 
         SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED);
     }


@@ -1054,6 +1088,19 @@ void wxListBox::Activate(int item)
 // input handling
 // ----------------------------------------------------------------------------
 
 // input handling
 // ----------------------------------------------------------------------------
 

+/*
+   The numArg here is the listbox item index while the strArg is used
+   differently for the different actions:
+
+   a) for wxACTION_LISTBOX_FIND it has the natural meaning: this is the string
+      to find
+
+   b) for wxACTION_LISTBOX_SELECT and wxACTION_LISTBOX_EXTENDSEL it is used
+      to decide if the listbox should send the notification event (it is empty)
+      or not (it is not): this allows us to reuse the same action for when the
+      user is dragging the mouse when it has been released although in the
+      first case no notification is sent while in the second it is sent.
+ */

 bool wxListBox::PerformAction(const wxControlAction& action,
                               long numArg,
                               const wxString& strArg)
 bool wxListBox::PerformAction(const wxControlAction& action,
                               long numArg,
                               const wxString& strArg)


@@ -1061,28 +1108,36 @@ bool wxListBox::PerformAction(const wxControlAction& action,
     int item = (int)numArg;
 
     if ( action == wxACTION_LISTBOX_SETFOCUS )
     int item = (int)numArg;
 
     if ( action == wxACTION_LISTBOX_SETFOCUS )

+    {

         SetCurrentItem(item);
         SetCurrentItem(item);

+    }

     else if ( action == wxACTION_LISTBOX_ACTIVATE )
     else if ( action == wxACTION_LISTBOX_ACTIVATE )

+    {

         Activate(item);
         Activate(item);

+    }

     else if ( action == wxACTION_LISTBOX_TOGGLE )
     {
         if ( item == -1 )
             item = m_current;
 
         if ( IsSelected(item) )
     else if ( action == wxACTION_LISTBOX_TOGGLE )
     {
         if ( item == -1 )
             item = m_current;
 
         if ( IsSelected(item) )

-            Unselect(item);
+            DoUnselect(item);

         else
             SelectAndNotify(item);
     }
     else if ( action == wxACTION_LISTBOX_SELECT )
     {
         DeselectAll(item);
         else
             SelectAndNotify(item);
     }
     else if ( action == wxACTION_LISTBOX_SELECT )
     {
         DeselectAll(item);

-        SelectAndNotify(item);
+
+        if ( strArg.empty() )
+            SelectAndNotify(item);
+        else
+            DoSelect(item);

     }
     else if ( action == wxACTION_LISTBOX_SELECTADD )
     }
     else if ( action == wxACTION_LISTBOX_SELECTADD )

-        Select(TRUE, item);
+        DoSelect(item);

     else if ( action == wxACTION_LISTBOX_UNSELECT )
     else if ( action == wxACTION_LISTBOX_UNSELECT )

-        Select(FALSE, item);
+        DoUnselect(item);

     else if ( action == wxACTION_LISTBOX_MOVEDOWN )
         ChangeCurrent(1);
     else if ( action == wxACTION_LISTBOX_MOVEUP )
     else if ( action == wxACTION_LISTBOX_MOVEDOWN )
         ChangeCurrent(1);
     else if ( action == wxACTION_LISTBOX_MOVEUP )


@@ -1253,14 +1308,33 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
         switch ( keycode )
         {
             // movement
         switch ( keycode )
         {
             // movement

-            case WXK_UP:    action = wxACTION_LISTBOX_MOVEUP; break;
-            case WXK_DOWN:  action = wxACTION_LISTBOX_MOVEDOWN; break;
+            case WXK_UP:
+                action = wxACTION_LISTBOX_MOVEUP;
+                break;
+
+            case WXK_DOWN:
+                action = wxACTION_LISTBOX_MOVEDOWN;
+                break;
+

             case WXK_PAGEUP:
             case WXK_PAGEUP:

-            case WXK_PRIOR: action = wxACTION_LISTBOX_PAGEUP; break;
+
+            case WXK_PRIOR:
+                action = wxACTION_LISTBOX_PAGEUP;
+                break;
+

             case WXK_PAGEDOWN:
             case WXK_PAGEDOWN:

-            case WXK_NEXT:  action = wxACTION_LISTBOX_PAGEDOWN; break;
-            case WXK_HOME:  action = wxACTION_LISTBOX_START; break;
-            case WXK_END:   action = wxACTION_LISTBOX_END; break;
+
+            case WXK_NEXT:
+                action = wxACTION_LISTBOX_PAGEDOWN;
+                break;
+
+            case WXK_HOME:
+                action = wxACTION_LISTBOX_START;
+                break;
+
+            case WXK_END:
+                action = wxACTION_LISTBOX_END;
+                break;

 
             // selection
             case WXK_SPACE:
 
             // selection
             case WXK_SPACE:


@@ -1342,7 +1416,6 @@ bool wxStdListboxInputHandler::HandleMouse(wxInputConsumer *consumer,
             winCapture->ReleaseMouse();
             m_btnCapture = 0;
 
             winCapture->ReleaseMouse();
             m_btnCapture = 0;
 

-            // generate the last event to triiger sending the selection event

             action = m_actionMouse;
         }
         //else: the mouse wasn't presed over the listbox, only released here
             action = m_actionMouse;
         }
         //else: the mouse wasn't presed over the listbox, only released here


@@ -1392,7 +1465,9 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
         if ( IsValidIndex(lbox, item) )
         {
 
         if ( IsValidIndex(lbox, item) )
         {

-            lbox->PerformAction(m_actionMouse, item);
+            // pass something into strArg to tell the listbox that it shouldn't
+            // send the notification message: see PerformAction() above
+            lbox->PerformAction(m_actionMouse, item, _T("no"));

         }
         // else: don't pass invalid index to the listbox
     }
         }
         // else: don't pass invalid index to the listbox
     }