Merge branch 'master' of https://github.com/prusa3d/Slic3r
This commit is contained in:
commit
60121025e2
1 changed files with 8 additions and 1 deletions
|
@ -183,14 +183,21 @@ namespace Slic3r { namespace GUI {
|
||||||
//! to allow the default handling
|
//! to allow the default handling
|
||||||
event.Skip();
|
event.Skip();
|
||||||
//! eliminating the g-code pop up text description
|
//! 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());
|
}), temp->GetId());
|
||||||
|
|
||||||
|
#if !defined(__WXGTK__)
|
||||||
temp->Bind(wxEVT_KILL_FOCUS, ([this, temp](wxEvent& e)
|
temp->Bind(wxEVT_KILL_FOCUS, ([this, temp](wxEvent& e)
|
||||||
{
|
{
|
||||||
e.Skip();// on_kill_focus(e);
|
e.Skip();// on_kill_focus(e);
|
||||||
temp->GetToolTip()->Enable(true);
|
temp->GetToolTip()->Enable(true);
|
||||||
}), temp->GetId());
|
}), temp->GetId());
|
||||||
|
#endif // __WXGTK__
|
||||||
|
|
||||||
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId());
|
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId());
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue