merged 2.6 branch changes back into trunk using : svn merge -r 8699:8706 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-2.6 .
This commit is contained in:
@@ -174,8 +174,14 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow
|
||||
bool _destroying;
|
||||
|
||||
MouseCursor _mouseCursor;
|
||||
|
||||
/// Persist which mouse cursor was used before switching to the resize cursors.
|
||||
MouseCursor _appMouseCursor;
|
||||
|
||||
std::map<MouseCursor,HCURSOR> _mouseCursorMap;
|
||||
|
||||
std::map<int, bool> _keyMap;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user