Merge branch 'jt/runway' into next

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

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 8a42629b0a79b9240b8025c7e7875b37f5d863be..ea4470fbb6a93bbd0dd78d416b611b3fcb83166c 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -36,7 +36,7 @@
 #include "fg_props.hxx"
 #include "viewer.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Define a structure containing view information
@@ -86,10 +86,12 @@ public:
     }
     inline FGViewer *next_view() {
        setView((current+1 < (int)views.size()) ? (current + 1) : 0);
+       view_number->fireValueChanged();
        return views[current];
     }
     inline FGViewer *prev_view() {
        setView((0 < current) ? (current - 1) : (views.size() - 1));
+       view_number->fireValueChanged();
        return views[current];
     }
 
@@ -146,9 +148,11 @@ private:
     int getView () const;
     void setView (int newview);
 
+    SGPropertyNode_ptr view_number;
     vector<SGPropertyNode_ptr> config_list;
-    typedef vector<FGViewer *> viewer_list;
+    typedef vector<SGSharedPtr<FGViewer> > viewer_list;
     viewer_list views;
+    SGVec3d abs_viewer_position;
 
     int current;