Merge branch 'master' into TimePath/scrollpanel

diff --combined qcsrc/menu/item.qh
index 457da8d679ee6d19e4155717676fddcc23c2ea54,a5df526806e851e7777f0e6792de627881a46145..6cee17b3fdd5f9ccd24a66d078f040aaee9110a2
--- 1/qcsrc/menu/item.qh
--- 2/qcsrc/menu/item.qh
+++ b/qcsrc/menu/item.qh
@@@ -2,13 -2,15 +2,15 @@@
  
  // convenience
  #include "skin.qh"
+ #include "draw.qh"
+ #include "menu.qh"
  
  CLASS(Item, Object)
        METHOD(Item, draw, void(Item));
        METHOD(Item, keyDown, float(Item, float, float, float));
        METHOD(Item, keyUp, float(Item, float, float, float));
        METHOD(Item, mouseMove, float(Item, vector));
 -      METHOD(Item, mousePress, float(Item, vector));
 +      METHOD(Item, mousePress, bool(Item this, vector pos));
        METHOD(Item, mouseDrag, float(Item, vector));
        METHOD(Item, mouseRelease, float(Item, vector));
        METHOD(Item, focusEnter, void(Item));