Don't call StartingKey if the key was F2

[wxWidgets.git] / src / msw / choice.cpp

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index ae626177ced4d4f469f216f15c955e079e4b8acb..a243f36fb04384bba928cc9b6ff2296bf4cb23f3 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -335,12 +335,12 @@ int wxChoice::FindString(const wxString& s) const
 #else // !Watcom
    //TODO:  Evidently some MSW versions (all?) don't like empty strings
    //passed to SendMessage, so we have to do it ourselves in that case
 #else // !Watcom
    //TODO:  Evidently some MSW versions (all?) don't like empty strings
    //passed to SendMessage, so we have to do it ourselves in that case

-   if ( s.size() == 0 )
+   if ( s.empty() )

    {
      int count = GetCount();
      for ( int i = 0; i < count; i++ )
      {
    {
      int count = GetCount();
      for ( int i = 0; i < count; i++ )
      {

-       if ( GetString(i).size() == 0 )
+       if ( GetString(i).empty() )

            return i;
      }
 
            return i;
      }