ensure that -2 font size is readable, it could be too small after last change

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

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 9b26f6c6144f717ccbfd7ad0504f9dbfe486f883..45e5f77e870c4a1db674fdf1c29cd44bb250a3cf 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -168,7 +168,7 @@ int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2)
 
 int wxListBox::DoAppendOnly(const wxString& item)
 {
 
 int wxListBox::DoAppendOnly(const wxString& item)
 {

-    size_t index;
+    unsigned int index;

 
     if ( IsSorted() )
     {
 
     if ( IsSorted() )
     {


@@ -211,14 +211,14 @@ int wxListBox::DoAppend(const wxString& item)
     return index;
 }
 
     return index;
 }
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)

 {
     // the position of the item being added to a sorted listbox can't be
     // specified
     wxCHECK_RET( !IsSorted(), _T("can't insert items into sorted listbox") );
 
 {
     // the position of the item being added to a sorted listbox can't be
     // specified
     wxCHECK_RET( !IsSorted(), _T("can't insert items into sorted listbox") );
 

-    size_t count = items.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    unsigned int count = items.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

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


@@ -241,16 +241,16 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     DoClear();
 
 {
     DoClear();
 

-    size_t count = items.GetCount();
+    unsigned int count = items.GetCount();

     if ( !count )
         return;
 
     m_strings->Alloc(count);
 
     m_itemsClientData.Alloc(count);
     if ( !count )
         return;
 
     m_strings->Alloc(count);
 
     m_itemsClientData.Alloc(count);

-    for ( size_t n = 0; n < count; n++ )
+    for ( unsigned int n = 0; n < count; n++ )

     {
     {

-        size_t index = DoAppendOnly(items[n]);
+        unsigned int index = DoAppendOnly(items[n]);

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


@@ -260,7 +260,7 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
     RefreshAll();
 }
 
     RefreshAll();
 }
 

-void wxListBox::SetString(int n, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)

 {
     wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
 
 {
     wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
 


@@ -282,7 +282,7 @@ void wxListBox::SetString(int n, const wxString& s)
             m_updateScrollbarX = true;
         }
         // or also decreased if the old string was the longest one
             m_updateScrollbarX = true;
         }
         // or also decreased if the old string was the longest one

-        else if ( n == m_maxWidthItem )
+        else if ( n == (unsigned int)m_maxWidthItem )

         {
             RefreshHorzScrollbar();
         }
         {
             RefreshHorzScrollbar();
         }


@@ -301,8 +301,8 @@ void wxListBox::DoClear()
 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {

-        size_t count = m_itemsClientData.GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = m_itemsClientData.GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             delete (wxClientData *) m_itemsClientData[n];
         }
         {
             delete (wxClientData *) m_itemsClientData[n];
         }


@@ -325,7 +325,7 @@ void wxListBox::Clear()
     RefreshAll();
 }
 
     RefreshAll();
 }
 

-void wxListBox::Delete(int n)
+void wxListBox::Delete(unsigned int n)

 {
     wxCHECK_RET( IsValid(n),
                  _T("invalid index in wxListBox::Delete") );
 {
     wxCHECK_RET( IsValid(n),
                  _T("invalid index in wxListBox::Delete") );


@@ -344,11 +344,11 @@ void wxListBox::Delete(int n)
     m_itemsClientData.RemoveAt(n);
 
     // when the item disappears we must not keep using its index
     m_itemsClientData.RemoveAt(n);
 
     // when the item disappears we must not keep using its index

-    if ( n == m_current )
+    if ( (int)n == m_current )

     {
         m_current = -1;
     }
     {
         m_current = -1;
     }

-    else if ( n < m_current )
+    else if ( (int)n < m_current )

     {
         m_current--;
     }
     {
         m_current--;
     }


@@ -357,15 +357,15 @@ void wxListBox::Delete(int n)
     // update the selections array: the indices of all seletected items after
     // the one being deleted must change and the item itselfm ust be removed
     int index = wxNOT_FOUND;
     // update the selections array: the indices of all seletected items after
     // the one being deleted must change and the item itselfm ust be removed
     int index = wxNOT_FOUND;

-    size_t count = m_selections.GetCount();
-    for ( size_t item = 0; item < count; item++ )
+    unsigned int count = m_selections.GetCount();
+    for ( unsigned int item = 0; item < count; item++ )

     {
     {

-        if ( m_selections[item] == n )
+        if ( m_selections[item] == (int)n )

         {
             // remember to delete it later
             index = item;
         }
         {
             // remember to delete it later
             index = item;
         }

-        else if ( m_selections[item] > n )
+        else if ( m_selections[item] > (int)n )

         {
             // to account for the index shift
             m_selections[item]--;
         {
             // to account for the index shift
             m_selections[item]--;


@@ -382,7 +382,7 @@ void wxListBox::Delete(int n)
     m_updateScrollbarY = true;
 
     // finally, if the longest item was deleted the scrollbar may disappear
     m_updateScrollbarY = true;
 
     // finally, if the longest item was deleted the scrollbar may disappear

-    if ( n == m_maxWidthItem )
+    if ( (int)n == m_maxWidthItem )

     {
         RefreshHorzScrollbar();
     }
     {
         RefreshHorzScrollbar();
     }


@@ -392,22 +392,22 @@ void wxListBox::Delete(int n)
 // client data handling
 // ----------------------------------------------------------------------------
 
 // client data handling
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetItemClientData(int n, void* clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
     m_itemsClientData[n] = clientData;
 }
 
 {
     m_itemsClientData[n] = clientData;
 }
 

-void *wxListBox::DoGetItemClientData(int n) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
     return m_itemsClientData[n];
 }
 
 {
     return m_itemsClientData[n];
 }
 

-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     m_itemsClientData[n] = clientData;
 }
 
 {
     m_itemsClientData[n] = clientData;
 }
 

-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const

 {
     return (wxClientData *)m_itemsClientData[n];
 }
 {
     return (wxClientData *)m_itemsClientData[n];
 }


@@ -461,10 +461,10 @@ void wxListBox::DoSetSelection(int n, bool select)
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

-    wxCHECK_MSG( !HasMultipleSelection(), -1,
+    wxCHECK_MSG( !HasMultipleSelection(), wxNOT_FOUND,

                  _T("use wxListBox::GetSelections for ths listbox") );
 
                  _T("use wxListBox::GetSelections for ths listbox") );
 

-    return m_selections.IsEmpty() ? -1 : m_selections[0];
+    return m_selections.IsEmpty() ? wxNOT_FOUND : m_selections[0];

 }
 
 int wxCMPFUNC_CONV wxCompareInts(int *n, int *m)
 }
 
 int wxCMPFUNC_CONV wxCompareInts(int *n, int *m)


@@ -476,7 +476,7 @@ int wxListBox::GetSelections(wxArrayInt& selections) const
 {
     // always return sorted array to the user
     selections = m_selections;
 {
     // always return sorted array to the user
     selections = m_selections;

-    size_t count = m_selections.GetCount();
+    unsigned int count = m_selections.GetCount();

 
     // don't call sort on an empty array
     if ( count )
 
     // don't call sort on an empty array
     if ( count )


@@ -574,9 +574,9 @@ void wxListBox::UpdateScrollbars()
     wxSize size = GetClientSize();
 
     // is our height enough to show all items?
     wxSize size = GetClientSize();
 
     // is our height enough to show all items?

-    size_t nLines = GetCount();
+    unsigned int nLines = GetCount();

     wxCoord lineHeight = GetLineHeight();
     wxCoord lineHeight = GetLineHeight();

-    bool showScrollbarY = nLines*lineHeight > size.y;
+    bool showScrollbarY = (int)nLines*lineHeight > size.y;

 
     // check the width too if required
     wxCoord charWidth, maxWidth;
 
     // check the width too if required
     wxCoord charWidth, maxWidth;


@@ -705,9 +705,9 @@ void wxListBox::DoDraw(wxControlRenderer *renderer)
 
     // get the items which must be redrawn
     wxCoord lineHeight = GetLineHeight();
 
     // get the items which must be redrawn
     wxCoord lineHeight = GetLineHeight();

-    size_t itemFirst = yTop / lineHeight,
-           itemLast = (yBottom + lineHeight - 1) / lineHeight,
-           itemMax = m_strings->GetCount();
+    unsigned int itemFirst = yTop / lineHeight,
+                 itemLast = (yBottom + lineHeight - 1) / lineHeight,
+                 itemMax = m_strings->GetCount();

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


@@ -776,8 +776,8 @@ wxCoord wxListBox::GetMaxWidth() const
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;

-        size_t count = m_strings->GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = m_strings->GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             GetTextExtent(this->GetString(n), &width, NULL);
             if ( width > m_maxWidth )
         {
             GetTextExtent(this->GetString(n), &width, NULL);
             if ( width > m_maxWidth )


@@ -833,8 +833,8 @@ wxSize wxListBox::DoGetBestClientSize() const
     wxCoord width = 0,
             height = 0;
 
     wxCoord width = 0,
             height = 0;
 

-    size_t count = m_strings->GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    unsigned int count = m_strings->GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         wxCoord w,h;
         GetTextExtent(this->GetString(n), &w, &h);
     {
         wxCoord w,h;
         GetTextExtent(this->GetString(n), &w, &h);


@@ -913,7 +913,7 @@ void wxListBox::SetCurrentItem(int n)
 
 bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
 {
 
 bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
 {

-    size_t count = GetCount();
+    unsigned int count = GetCount();

     if ( count==0 )
     {
         // empty listbox, we can't find anything in it
     if ( count==0 )
     {
         // empty listbox, we can't find anything in it


@@ -927,7 +927,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
     {
         // the following line will set first correctly to 0 if there is no
         // selection (m_current == -1)
     {
         // the following line will set first correctly to 0 if there is no
         // selection (m_current == -1)

-        first = m_current == count - 1 ? 0 : m_current + 1;
+        first = m_current == (int)(count - 1) ? 0 : m_current + 1;

     }
     else // start with the current
     {
     }
     else // start with the current
     {


@@ -943,7 +943,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
     size_t len = prefix.length();
 
     // loop over all items in the listbox
     size_t len = prefix.length();
 
     // loop over all items in the listbox

-    for ( int item = first; item != (int)last; item < count - 1 ? item++ : item = 0 )
+    for ( int item = first; item != (int)last; item < (int)(count - 1) ? item++ : item = 0 )

     {
         if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 )
         {
     {
         if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 )
         {


@@ -1055,7 +1055,7 @@ void wxListBox::ExtendSelection(int itemTo)
         SetSelection(n);
     }
 
         SetSelection(n);
     }
 

-    size_t count = GetCount();
+    unsigned int count = GetCount();

     for ( ; n < (int)count; n++ )
     {
         Deselect(n);
     for ( ; n < (int)count; n++ )
     {
         Deselect(n);


@@ -1230,7 +1230,7 @@ int wxStdListboxInputHandler::FixItemIndex(const wxListBox *lbox,
         // mouse is above the first item
         item = 0;
     }
         // mouse is above the first item
         item = 0;
     }

-    else if ( (size_t)item >= lbox->GetCount() )
+    else if ( (unsigned int)item >= lbox->GetCount() )

     {
         // mouse is below the last item
         item = lbox->GetCount() - 1;
     {
         // mouse is below the last item
         item = lbox->GetCount() - 1;


@@ -1241,7 +1241,7 @@ int wxStdListboxInputHandler::FixItemIndex(const wxListBox *lbox,
 
 bool wxStdListboxInputHandler::IsValidIndex(const wxListBox *lbox, int item)
 {
 
 bool wxStdListboxInputHandler::IsValidIndex(const wxListBox *lbox, int item)
 {

-    return item >= 0 && (size_t)item < lbox->GetCount();
+    return item >= 0 && (unsigned int)item < lbox->GetCount();

 }
 
 wxControlAction
 }
 
 wxControlAction


@@ -1340,14 +1340,10 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
                 break;
 
             case WXK_PAGEUP:
                 break;
 
             case WXK_PAGEUP:

-
-            case WXK_PRIOR:

                 action = wxACTION_LISTBOX_PAGEUP;
                 break;
 
             case WXK_PAGEDOWN:
                 action = wxACTION_LISTBOX_PAGEUP;
                 break;
 
             case WXK_PAGEDOWN:

-
-            case WXK_NEXT:

                 action = wxACTION_LISTBOX_PAGEDOWN;
                 break;
 
                 action = wxACTION_LISTBOX_PAGEDOWN;
                 break;