Merge branch 'master' into dev

This commit is contained in:
Lukas Matena
2020-03-24 21:51:05 +01:00
166 changed files with 13682 additions and 9161 deletions

View File

@@ -206,7 +206,7 @@ public:
void render_overlay() const;
const std::string& get_tooltip() const { return m_tooltip; }
std::string get_tooltip() const;
bool on_mouse(wxMouseEvent& evt);
bool on_mouse_wheel(wxMouseEvent& evt);