Merge remote-tracking branch 'origin/master' into dev

oxygine/src/HttpRequestTask.cpp

@@ -4,7 +4,12 @@
 
 namespace oxygine
 {
-    HttpRequestTask::createHttpRequestCallback _createRequestsCallback = 0;
+    HttpRequestTask* createNullHttpTask()
+    {
+        return 0;
+    }
+
+    HttpRequestTask::createHttpRequestCallback _createRequestsCallback = createNullHttpTask;
 
     spHttpRequestTask HttpRequestTask::create()
     {

oxygine/src/Input.cpp

@@ -61,11 +61,9 @@ namespace oxygine
 
     void Input::sendPointerWheelEvent(spStage stage, int scroll, PointerState* ps)
     {
-        TouchEvent me(scroll > 0 ? TouchEvent::WHEEL_UP : TouchEvent::WHEEL_DOWN, true);
+        TouchEvent me(scroll > 0 ? TouchEvent::WHEEL_UP : TouchEvent::WHEEL_DOWN, true, ps->getPosition());
         me.index = ps->getIndex();
 
-        ps->_position = Vector2(0, 0);
-
         stage->handleEvent(&me);
     }