Disable some wxWebView tests that fail on the buildbot but not locally.

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

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

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

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


@@ -642,6 +642,16 @@ int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const
     return m_strings.Index(s, bCase);
 }
 
     return m_strings.Index(s, bCase);
 }
 

+bool wxVListBoxComboPopup::FindItem(const wxString& item, wxString* trueItem)
+{
+    int idx = m_strings.Index(item, false);
+    if ( idx == wxNOT_FOUND )
+        return false;
+    if ( trueItem != NULL )
+        *trueItem = m_strings[idx];
+    return true;
+}
+

 unsigned int wxVListBoxComboPopup::GetCount() const
 {
     return m_strings.GetCount();
 unsigned int wxVListBoxComboPopup::GetCount() const
 {
     return m_strings.GetCount();


@@ -855,7 +865,7 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 
     // Find initial selection
     wxString strValue = m_combo->GetValue();
 
     // Find initial selection
     wxString strValue = m_combo->GetValue();

-    if ( strValue.length() )
+    if ( !strValue.empty() )

         m_value = m_strings.Index(strValue);
 }
 
         m_value = m_strings.Index(strValue);
 }
 


@@ -867,21 +877,6 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 

-
-#if wxUSE_EXTENDED_RTTI
-IMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems, "wx/odcombo.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxOwnerDrawnComboBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
-#endif
-

 void wxOwnerDrawnComboBox::Init()
 {
 }
 void wxOwnerDrawnComboBox::Init()
 {
 }


@@ -907,7 +902,6 @@ wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent,
                                            long style,
                                            const wxValidator& validator,
                                            const wxString& name)
                                            long style,
                                            const wxValidator& validator,
                                            const wxString& name)

-    : wxComboCtrl()

 {
     Init();
 
 {
     Init();