diff --git a/include/wx/combo.h b/include/wx/combo.h
index 2ba9780a2d..8becce369c 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -482,8 +482,8 @@ protected:
     {
         return ( !m_text &&
                  !(flags & wxCONTROL_ISSUBMENU) &&
-                 !m_valueString.length() &&
-                 m_hintText.length() &&
+                 m_valueString.empty() &&
+                 !m_hintText.empty() &&
                  !ShouldDrawFocus() );
     }