Made sorting case-insensitive (to match wxComboBox) and fixed sorting in general...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 9759b33a33dff0ad28359f69db002636b56c64fd..f3cef112d9dfc0b8c2e69720d26f0e912e0ecca7 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -504,7 +504,7 @@ int wxVListBoxComboPopup::Append(const wxString& item)
 
         for ( i=0; i<strings.GetCount(); i++ )
         {
 
         for ( i=0; i<strings.GetCount(); i++ )
         {

-            if ( item.Cmp(strings.Item(i)) < 0 )
+            if ( item.CmpNoCase(strings.Item(i)) < 0 )

             {
                 pos = (int)i;
                 break;
             {
                 pos = (int)i;
                 break;


@@ -1039,7 +1039,7 @@ int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
         for ( unsigned int i = 0; i < count; ++i )
         {
 
         for ( unsigned int i = 0; i < count; ++i )
         {

-            int n = GetVListBoxComboPopup()->Append(items[i]);
+            n = GetVListBoxComboPopup()->Append(items[i]);

             AssignNewItemClientData(n, clientData, i, type);
         }
 
             AssignNewItemClientData(n, clientData, i, type);
         }