Follow-up to 299b01d813352fdcb8e54d1618c2c919e8180f99

Refactor of enum configs
Fixing for OSX
This commit is contained in:
Vojtech Bubnik 2023-02-01 17:00:34 +01:00 committed by YuSanka
parent 7e7fe7c37f
commit f2fbfef332

View file

@ -1306,11 +1306,11 @@ void Choice::msw_rescale()
field->SetSize(size);
size_t idx = 0;
if (! m_opt.enum_labels.empty() || ! m_opt.enum_values.empty()) {
if (m_opt.enum_def && ! m_opt.enum_def->labels().empty()) {
size_t counter = 0;
bool labels = ! m_opt.enum_labels.empty();
for (const std::string &el : labels ? m_opt.enum_labels : m_opt.enum_values) {
wxString text = labels ? _(el) : from_u8(el);
bool localized = m_opt.enum_def->has_labels();
for (const std::string &el : m_opt.enum_def->labels()) {
wxString text = localized ? _(el) : from_u8(el);
field->Append(text);
if (text == selection)
idx = counter;