diff options
author | Lukas Matena <lukasmatena@seznam.cz> | 2018-05-11 16:42:11 +0300 |
---|---|---|
committer | Lukas Matena <lukasmatena@seznam.cz> | 2018-05-11 16:42:11 +0300 |
commit | 60121025e2587c91d007094060cbb756d0e8fe2e (patch) | |
tree | 5fd9acfaae54e6cf6e25988b9b273c39c389be84 | |
parent | 613bcf80555ba5982797e31bed7bad9407ea8ae4 (diff) | |
parent | d53127fa44125f7f13cba6fbf536f96455a1e6e7 (diff) |
Merge branch 'master' of https://github.com/prusa3d/Slic3r
-rw-r--r-- | xs/src/slic3r/GUI/Field.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xs/src/slic3r/GUI/Field.cpp b/xs/src/slic3r/GUI/Field.cpp index 0fcf480e3..4febae362 100644 --- a/xs/src/slic3r/GUI/Field.cpp +++ b/xs/src/slic3r/GUI/Field.cpp @@ -183,14 +183,21 @@ namespace Slic3r { namespace GUI { //! to allow the default handling event.Skip(); //! eliminating the g-code pop up text description - temp->GetToolTip()->Enable(false); + bool flag = false; +#ifdef __WXGTK__ + // I have no idea why, but on GTK flag works in other way + flag = true; +#endif // __WXGTK__ + temp->GetToolTip()->Enable(flag); }), temp->GetId()); +#if !defined(__WXGTK__) temp->Bind(wxEVT_KILL_FOCUS, ([this, temp](wxEvent& e) { e.Skip();// on_kill_focus(e); temp->GetToolTip()->Enable(true); }), temp->GetId()); +#endif // __WXGTK__ temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId()); |