Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-03-13 20:04:57 +01:00
14 changed files with 42 additions and 23 deletions

View File

@@ -142,7 +142,7 @@ public:
virtual void stopNumericalAdjustment() = 0;
virtual void pipetteMouseOver(EditDataProvider *provider, int modifierKey) = 0;
virtual void pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) = 0;
virtual bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) = 0;
virtual void pipetteButton1Released(EditDataProvider *provider) = 0;
virtual void pipetteDrag(EditDataProvider *provider, int modifierKey) = 0;