VS2015 compatability fixes.

[flightgear.git] / src / Main / fg_os_common.cxx

diff --git a/src/Main/fg_os_common.cxx b/src/Main/fg_os_common.cxx
index 5f1921df1865460bf0cc52a17ee1ef99583338c6..3dd07c610a81bf6e12043d5a5791211cb51d45ab 100644 (file)
--- a/src/Main/fg_os_common.cxx
+++ b/src/Main/fg_os_common.cxx
@@ -17,52 +17,42 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <plib/pu.h>
 #include <osg/GraphicsContext>
 
+#include <Viewer/renderer.hxx>
+#include <Viewer/FGEventHandler.hxx>
 #include "fg_os.hxx"
 #include "globals.hxx"
-#include "renderer.hxx"
 
 // fg_os callback registration APIs
 //
 
 // Event handling and scene graph update is all handled by a
-// manipulator. See FGManipulator.cpp
+// manipulator. See FGEventHandler.cpp
 void fgRegisterIdleHandler(fgIdleHandler func)
 {
-    globals->get_renderer()->getManipulator()->setIdleHandler(func);
-}
-
-void fgRegisterDrawHandler(fgDrawHandler func)
-{
-    globals->get_renderer()->getManipulator()->setDrawHandler(func);
-}
-
-void fgRegisterWindowResizeHandler(fgWindowResizeHandler func)
-{
-    globals->get_renderer()->getManipulator()->setWindowResizeHandler(func);
+    globals->get_renderer()->getEventHandler()->setIdleHandler(func);
 }
 
 void fgRegisterKeyHandler(fgKeyHandler func)
 {
-    globals->get_renderer()->getManipulator()->setKeyHandler(func);
+    globals->get_renderer()->getEventHandler()->setKeyHandler(func);
 }
 
 void fgRegisterMouseClickHandler(fgMouseClickHandler func)
 {
-    globals->get_renderer()->getManipulator()->setMouseClickHandler(func);
+    globals->get_renderer()->getEventHandler()->setMouseClickHandler(func);
 }
 
 void fgRegisterMouseMotionHandler(fgMouseMotionHandler func)
 {
-    globals->get_renderer()->getManipulator()->setMouseMotionHandler(func);
+    globals->get_renderer()->getEventHandler()->setMouseMotionHandler(func);
 }
 
-// Redraw "happens" every frame whether you want it or not.
-void fgRequestRedraw()
-{
-}