merge with dev

This commit is contained in:
Desmis
2019-03-25 11:19:06 +01:00
68 changed files with 3707 additions and 826 deletions

View File

@@ -249,7 +249,7 @@ private:
void updateControlSpotCurve(Gtk::TreeModel::Row row);
void deleteControlSpotCurve(Gtk::TreeModel::Row row);
CursorShape getCursor(int objectID);
bool mouseOver(int modifierKey);
const bool mouseOver(int modifierKey);
bool button1Pressed(int modifierKey);
bool button1Released();
bool drag1(int modifierKey);