From b9a52ab447b774e87844a891b60b0697638a5d31 Mon Sep 17 00:00:00 2001
From: "Xawotihs@gmail.com"
 <Xawotihs@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 26 Jan 2012 23:17:40 +0000
Subject: [PATCH] Fixed compilation of the Qt frontend with latest scroll
 changes fixed Qt project compilation with Mingw on Windows

---
 JGE/include/JTypes.h                     | 2 +-
 JGE/include/qt/corewrapper.h             | 4 ++--
 JGE/src/qt/corewrapper.cpp               | 4 ++--
 projects/mtg/include/PrecompiledHeader.h | 2 +-
 projects/mtg/include/config.h            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h
index 1a7f86d71..42ce24b41 100644
--- a/JGE/include/JTypes.h
+++ b/JGE/include/JTypes.h
@@ -85,7 +85,7 @@ enum {
 	#define BLEND_OPTION_BLEND	GU_TFX_BLEND
 #endif
 
-#ifdef WIN32
+#if (defined WIN32) && (!defined LINUX)
 	#include <windows.h>
 #endif
 #if defined(LINUX) || defined(IOS) || defined (ANDROID)
diff --git a/JGE/include/qt/corewrapper.h b/JGE/include/qt/corewrapper.h
index 55c91a284..317da8f40 100644
--- a/JGE/include/qt/corewrapper.h
+++ b/JGE/include/qt/corewrapper.h
@@ -72,8 +72,8 @@ public:
     Q_INVOKABLE qint64 getTick() {
         return g_startTimer.elapsed();
     };
-    Q_INVOKABLE void doScroll(int x, int y) {
-        m_engine->Scroll(x, y);
+    Q_INVOKABLE void doScroll(int x, int y, int magnitude) {
+        m_engine->Scroll(x, y, magnitude);
     };
     int getNominalHeight(){ return SCREEN_HEIGHT;};
     int getNominalWidth(){ return SCREEN_WIDTH;};
diff --git a/JGE/src/qt/corewrapper.cpp b/JGE/src/qt/corewrapper.cpp
index d6c6503b1..f7e66cc94 100644
--- a/JGE/src/qt/corewrapper.cpp
+++ b/JGE/src/qt/corewrapper.cpp
@@ -333,10 +333,10 @@ void WagicCore::wheelEvent ( QGraphicsSceneWheelEvent * event)
 #endif
 {
     if(event->orientation() == Qt::Vertical)
-        m_engine->Scroll(0, 3*event->delta());
+        m_engine->Scroll(0, 3*event->delta(), static_cast<int>(sqrt(9*event->delta()*event->delta())));
     else
 
-        m_engine->Scroll(3*event->delta(), 0);
+        m_engine->Scroll(3*event->delta(), 0, static_cast<int>(sqrt(9*event->delta()*event->delta())));
 
     event->accept();
 }
diff --git a/projects/mtg/include/PrecompiledHeader.h b/projects/mtg/include/PrecompiledHeader.h
index c33a12335..8bbbdf585 100644
--- a/projects/mtg/include/PrecompiledHeader.h
+++ b/projects/mtg/include/PrecompiledHeader.h
@@ -23,7 +23,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#if defined (IOS) || defined (ANDROID)
+#if defined (IOS) || defined (ANDROID) || defined (QT_CONFIG)
 #define TOUCH_ENABLED
 #endif
 
diff --git a/projects/mtg/include/config.h b/projects/mtg/include/config.h
index 240eec5cf..a9c7bcb24 100644
--- a/projects/mtg/include/config.h
+++ b/projects/mtg/include/config.h
@@ -1,7 +1,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
-#if WIN32
+#if (defined WIN32) && (!defined QT_CONFIG)
 #define snprintf sprintf_s
 #endif