Use a " " (space) for the menu item if an empty string is used for an item in a wxCho...

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

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index f303ec637c3f120c54ffada386daea4548bf7b57..966974de067a369fb6697de8f8eaa0d71114df0d 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -126,7 +126,10 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
             m_strings.Insert( items[i], idx );
         }
 
             m_strings.Insert( items[i], idx );
         }
 

-        m_popUpMenu->Insert( idx, i+1, items[i] );
+        wxString text = items[i];
+        if (text == wxEmptyString)
+            text = " ";  // menu items can't have empty labels
+        m_popUpMenu->Insert( idx, i+1, text );

         m_datas.Insert( NULL, idx );
         AssignNewItemClientData(idx, clientData, i, type);
     }
         m_datas.Insert( NULL, idx );
         AssignNewItemClientData(idx, clientData, i, type);
     }