Merge branch 'master' of https://github.com/prusa3d/Slic3r
This commit is contained in:
commit
05baa4b743
1 changed files with 7 additions and 2 deletions
|
@ -631,8 +631,13 @@ void Choice::set_value(const boost::any& value, bool change_event)
|
||||||
break;
|
break;
|
||||||
++idx;
|
++idx;
|
||||||
}
|
}
|
||||||
idx == m_opt.enum_values.size() ?
|
if (idx == m_opt.enum_values.size()) {
|
||||||
dynamic_cast<wxComboBox*>(window)->SetValue(text_value) :
|
// For editable Combobox under OSX is needed to set selection to -1 explicitly,
|
||||||
|
// otherwise selection doesn't be changed
|
||||||
|
dynamic_cast<wxComboBox*>(window)->SetSelection(-1);
|
||||||
|
dynamic_cast<wxComboBox*>(window)->SetValue(text_value);
|
||||||
|
}
|
||||||
|
else
|
||||||
dynamic_cast<wxComboBox*>(window)->SetSelection(idx);
|
dynamic_cast<wxComboBox*>(window)->SetSelection(idx);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue