Merge branch 'vivian/tachy' into next

[flightgear.git] / src / Main / fg_os.hxx

diff --git a/src/Main/fg_os.hxx b/src/Main/fg_os.hxx
index c12e79b7bd0d9aa27d4a662139a5c7ff18ce65ad..62f6f8f7ddc89029b73432fa4af5733f4c47896e 100644 (file)
--- a/src/Main/fg_os.hxx
+++ b/src/Main/fg_os.hxx
@@ -24,7 +24,16 @@ enum { MOUSE_CURSOR_NONE,
        MOUSE_CURSOR_POINTER,
        MOUSE_CURSOR_WAIT,
        MOUSE_CURSOR_CROSSHAIR,
-       MOUSE_CURSOR_LEFTRIGHT };
+       MOUSE_CURSOR_LEFTRIGHT,
+       MOUSE_CURSOR_TOPSIDE,
+       MOUSE_CURSOR_BOTTOMSIDE,
+       MOUSE_CURSOR_LEFTSIDE,
+       MOUSE_CURSOR_RIGHTSIDE,
+       MOUSE_CURSOR_TOPLEFT,
+       MOUSE_CURSOR_TOPRIGHT,
+       MOUSE_CURSOR_BOTTOMLEFT,
+       MOUSE_CURSOR_BOTTOMRIGHT,
+};
 
 enum { KEYMOD_NONE     = 0,
        KEYMOD_RELEASED = 1, // Not a mod key, indicates "up" action
@@ -84,18 +93,4 @@ void fgRegisterWindowResizeHandler(fgWindowResizeHandler func);
 void fgRegisterKeyHandler(fgKeyHandler func);
 void fgRegisterMouseClickHandler(fgMouseClickHandler func);
 void fgRegisterMouseMotionHandler(fgMouseMotionHandler func);
-
-bool fgOSIsMainCamera(const osg::Camera* camera);
-bool fgOSIsMainContext(const osg::GraphicsContext* context);
-
-/** Get graphics context of the main camera. This is the principal
- * window in multi-window configurations, or the only window in an
- * embedded configuration. The GUI will be added to this context.
- */
-osg::GraphicsContext* fgOSGetMainContext();
-
-
-
-
-
 #endif // _FG_OS_HXX