Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev

This commit is contained in:
Enrico Turri 2018-09-05 14:12:58 +02:00
commit b9e6f8f3e3

View File

@ -228,10 +228,13 @@ namespace Slic3r { namespace GUI {
}), temp->GetId());
#endif // __WXGTK__
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent)
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent& evt)
{
#ifdef __WXGTK__
bChangedValueEvent = true;
if (bChangedValueEvent)
change_field_value(evt);
else
bChangedValueEvent = true;
#else
on_change_field();
#endif //__WXGTK__
@ -270,7 +273,9 @@ namespace Slic3r { namespace GUI {
#ifdef __WXGTK__
void TextCtrl::change_field_value(wxEvent& event)
{
if (bChangedValueEvent) {
if (event.GetEventType() == wxEVT_TEXT_PASTE)
bChangedValueEvent = true;
else if (bChangedValueEvent) {
on_change_field();
bChangedValueEvent = false;
}