From Erik van Dekker,

"I made several modifications:

 

    * The cause of my errors was that my OSG source directory path contains spaces. To fix this issue I wrapped all paths with quotes, as stated in doxygen documentation.

 

    * I also received some warning messages about deprecated doxygen settings, which I fixed by updating the doxygen file, i.e. running \u2018doxygen \u2013u doxygen.cmake\u2018. By running this command deprecated doxygen options are removed, some option comments have changed and quite some options have been added (I kept their default settings unless mentioned).

 

    * I was surprised to find that the doxygen OUTPUT_DIRECTORY was set to \u201c${OpenSceneGraph_SOURCE_DIR}/doc\u201d, which does not seem appropriate for out of source builds; I changed this to \u201c${OpenSceneGraph_BINARY_DIR}/doc\u201d. (On the other hand, maybe a cmake selectable option should be given to the user?)

 

    * Fixed two warnings I received about unexpected end-of-list-markers in \u2018osg\AnimationPath and \u2018osgUtil\CullVisitor due to excess trailing points in comments.

 

    * Fixed a warning in osgWidget\StyleInterface due to an #include directive (strangely) placed inside a namespace.

 

    * Fixed a warning in osg\Camera due to the META_Object macro that confused doxygen. Adding a semi-colon fixed this.

 

    * Removed auto_Mainpage from the INCLUDE option, because I am positive that this file does not belong there; It never generated useful documentation anyway.

 

    * I added the OSG version number environment variable to the PROJECT_NUMBER option so that the version number is now shown on the main page of generated documentation (e.g. index.html).

 

    * Changed option FULL_PATH_NAMES to YES, but made sure STRIP_FROM_PATH stripped the absolute path until the include dir. This fixed an issue that created mangled names for identical filenames in different directories. E.g. osg/Export and osgDB/Export are now correctly named.

 

    * Changed option SHOW_DIRECTORIES to yes, which is a case of preference I guess.

 "

doc/Doxyfiles/doxyfile.cmake

@@ -1,4 +1,4 @@
-# Doxyfile 1.3.6
+# Doxyfile 1.5.6
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,6 +14,14 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
@@ -23,23 +31,34 @@ PROJECT_NAME           = OpenSceneGraph
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         = ${OPENSCENEGRAPH_VERSION}
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ${OpenSceneGraph_SOURCE_DIR}/doc/
+OUTPUT_DIRECTORY       = "${PROJECT_BINARY_DIR}/doc/"
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, 
+# and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
@@ -70,11 +89,12 @@ REPEAT_BRIEF           = YES
 # This tag implements a quasi-intelligent brief description abbreviator 
 # that is used to form the text in various listings. Each string 
 # in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
+# stripped from the text and the result after processing the whole list, is 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
-# blank, the following values are used ("$name" is automatically replaced with the 
+# If left blank, the following values are used ("$name" is automatically 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
 
 ABBREVIATE_BRIEF       = 
 
@@ -84,10 +104,10 @@ ABBREVIATE_BRIEF       =
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# members of a class in the documentation of that class as if those members were 
+# inherited members of a class in the documentation of that class as if those 
-# ordinary class members. Constructors, destructors and assignment operators of 
+# members were ordinary class members. Constructors, destructors and assignment 
-# the base classes will not be shown.
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
@@ -95,16 +115,25 @@ INLINE_INHERITED_MEMB  = NO
 # path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list. 
+# the path. The tag can be used to show relative paths in the file list. 
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = "${OpenSceneGraph_SOURCE_DIR}/include/"
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
@@ -115,11 +144,19 @@ SHORT_NAMES            = YES
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
+# comments will behave just like regular Qt-style comments 
-# explicit @brief command for a brief description.
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
 # treat a multi-line C++ special comment block (i.e. a block of //! or /// 
 # comments) as a brief description. This used to be the default behaviour. 
@@ -141,12 +178,11 @@ DETAILS_AT_TOP         = NO
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
+# a new page for each member. If set to NO, the documentation of a member will 
-# member in the group (if any) for the other members of the group. By default 
+# be part of the file/class/namespace that contains it.
-# all members of a group must be documented explicitly.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -162,20 +198,68 @@ TAB_SIZE               = 8
 
 ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# only. Doxygen will then generate output that is more tailored for C. 
+# sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# only. Doxygen will then generate output that is more tailored for Java. 
+# sources only. Doxygen will then generate output that is more tailored for 
-# For instance, namespaces will be presented as packages, qualified scopes 
+# Java. For instance, namespaces will be presented as packages, qualified 
-# will look different, etc.
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
 # the same type (for instance a group of public functions) to be put as a 
 # subgroup of that type (e.g. under the Public Functions section). Set it to 
@@ -184,6 +268,16 @@ OPTIMIZE_OUTPUT_JAVA   = NO
 
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -211,6 +305,21 @@ EXTRACT_STATIC         = NO
 
 EXTRACT_LOCAL_CLASSES  = NO
 
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -251,7 +360,7 @@ INTERNAL_DOCS          = NO
 # file names in lower-case letters. If set to YES upper-case letters are also 
 # allowed. This is useful if you have classes or files whose names only differ 
 # in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
@@ -286,6 +395,12 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
 # sorted by fully-qualified names, including namespaces. If set to 
 # NO (the default), the class list will be sorted only by class name, 
@@ -341,6 +456,34 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -369,10 +512,20 @@ WARN_IF_UNDOCUMENTED   = YES
 
 WARN_IF_DOC_ERROR      = YES
 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
@@ -391,28 +544,35 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ${OpenSceneGraph_SOURCE_DIR}/include/osg \
+INPUT                  = "${OpenSceneGraph_SOURCE_DIR}/include/osg" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgDB \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgDB" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgFX \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgFX" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgGA \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgGA" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgIntrospection \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgIntrospection" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgParticle \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgManipulator" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgViewer \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgParticle" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgWidget \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgShadow" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgManipulator \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgSim" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgShadow \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgTerrain" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgSim \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgText" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgTerrain \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgUtil" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgText \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgViewer" \
-                         ${OpenSceneGraph_SOURCE_DIR}/include/osgUtil \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgWidget"
-                         ${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/auto_Mainpage
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *include* \
                          *.cpp
@@ -429,17 +589,28 @@ RECURSIVE              = YES
 
 EXCLUDE                = 
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = */.svn/*
 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
 # the \include command).
@@ -471,10 +642,20 @@ IMAGE_PATH             =
 # by executing (via popen()) the command <filter> <input-file>, where <filter> 
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
 # input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
 
 INPUT_FILTER           = 
 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
@@ -503,18 +684,33 @@ INLINE_SOURCES         = NO
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
+# If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
@@ -575,7 +771,7 @@ HTML_HEADER            =
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = ${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html
+HTML_FOOTER            = "${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html"
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
@@ -594,11 +790,44 @@ HTML_ALIGN_MEMBERS     = YES
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
@@ -619,6 +848,12 @@ HHC_LOCATION           =
 
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
 # controls whether a binary table of contents is generated (YES) or a 
 # normal table of contents (NO) in the .chm file.
@@ -641,12 +876,20 @@ DISABLE_INDEX          = NO
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# generated containing a tree-like index structure (just like the one that 
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hiererachy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
 
 GENERATE_TREEVIEW      = NO
 
@@ -656,6 +899,14 @@ GENERATE_TREEVIEW      = NO
 
 TREEVIEW_WIDTH         = 250
 
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -901,7 +1152,7 @@ MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
@@ -927,7 +1178,9 @@ INCLUDE_FILE_PATTERNS  =
 # are defined before the preprocessor is started (similar to the -D option of 
 # gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
 
@@ -941,8 +1194,8 @@ EXPAND_AS_DEFINED      =
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
 # on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
+# function macros are typically used for boiler-plate code, and will confuse 
-# parser if not removed.
+# the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
@@ -994,13 +1247,23 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
+# this option is superseded by the HAVE_DOT option below. This is only a 
-# recommended to install and use dot, since it yields more powerful graphs.
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
 # or is not a class.
@@ -1014,6 +1277,24 @@ HIDE_UNDOC_RELATIONS   = YES
 
 HAVE_DOT               = YES
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -1028,6 +1309,11 @@ CLASS_GRAPH            = YES
 
 COLLABORATION_GRAPH    = NO
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
 # collaboration diagrams in a style similar to the OMG's Unified Modeling 
 # Language.
@@ -1053,19 +1339,34 @@ INCLUDE_GRAPH          = NO
 
 INCLUDED_BY_GRAPH      = NO
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# generate a call dependency graph for every global function or class method. 
+# doxygen will generate a call dependency graph for every global function 
-# Note that enabling this option will significantly increase the time of a run. 
+# or class method. Note that enabling this option will significantly increase 
-# So in most cases it will be better to enable call graphs for selected 
+# the time of a run. So in most cases it will be better to enable call graphs 
-# functions only using the \callgraph command.
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
@@ -1073,7 +1374,7 @@ GRAPHICAL_HIERARCHY    = YES
 DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = 
 
@@ -1083,33 +1384,41 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
-# this value, doxygen will try to truncate the graph, so that it fits within 
+# becomes larger than this value, doxygen will truncate the graph, which is 
-# the specified constraint. Beware that most browsers cannot cope with very 
+# visualized by representing a node as a red box. Note that doxygen if the 
-# large images.
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
-# lay further from the root node will be omitted. Note that setting this option to 
+# that lay further from the root node will be omitted. Note that setting this 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
-# note that a graph may be further truncated if the graph's image dimensions are 
+# code bases. Also note that the size of a graph can be further restricted by 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is enabled by default, which results in a transparent 
+# background. Warning: Depending on the platform used, enabling this option 
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they 
+# become hard to read).
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
 # arrows in the dot generated graphs.
@@ -1130,4 +1439,3 @@ DOT_CLEANUP            = YES
 # used. If set to NO the values of all tags below this one will be ignored.
 
 SEARCHENGINE           = ${SEARCHENGINE}
-

include/osg/AnimationPath

@@ -135,7 +135,7 @@ class OSG_EXPORT AnimationPath : public virtual osg::Object
             return true;
         }
 
-        /** Given a specific time, return the transformation matrix for a point..*/
+        /** Given a specific time, return the transformation matrix for a point. */
         bool getMatrix(double time,Matrixd& matrix) const
         {
             ControlPoint cp;

include/osg/Camera

@@ -449,7 +449,7 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
 
             DrawCallback(const DrawCallback&,const CopyOp&) {}
 
-            META_Object(osg,DrawCallback)
+            META_Object(osg, DrawCallback);
 
             /** Functor method called by rendering thread. Users will typically override this method to carry tasks such as screen capture.*/ 
             virtual void operator () (osg::RenderInfo& renderInfo) const;

include/osgUtil/CullVisitor

@@ -57,7 +57,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStac
         /// Copy constructor that does a shallow copy.
         CullVisitor(const CullVisitor&);
 
-        /** Create a shallow copy of the CullVisitor, used by CullVisitor::create() to clone the prototype..*/
+        /** Create a shallow copy of the CullVisitor, used by CullVisitor::create() to clone the prototype. */
         virtual CullVisitor* clone() const { return new CullVisitor(*this); }
 
         /** get the prototype singleton used by CullVisitor::create().*/

include/osgWidget/StyleInterface

@@ -17,10 +17,10 @@
 #ifndef OSGWIDGET_STYLE_INTERFACE
 #define OSGWIDGET_STYLE_INTERFACE
 
-namespace osgWidget {
-
 #include <osgWidget/Export>
 
+namespace osgWidget {
+
 class OSGWIDGET_EXPORT StyleInterface
 {
     public:

src/osgWrappers/osg/PagedLOD.cpp

@@ -163,6 +163,21 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
 	          __unsigned_int__getNumTimeStamps,
 	          "",
 	          "");
+	I_Method2(void, setFrameNumber, IN, unsigned int, childNo, IN, int, frameNumber,
+	          Properties::NON_VIRTUAL,
+	          __void__setFrameNumber__unsigned_int__int,
+	          "",
+	          "");
+	I_Method1(double, getFrameNumber, IN, unsigned int, childNo,
+	          Properties::NON_VIRTUAL,
+	          __double__getFrameNumber__unsigned_int,
+	          "",
+	          "");
+	I_Method0(unsigned int, getNumFrameNumbers,
+	          Properties::NON_VIRTUAL,
+	          __unsigned_int__getNumFrameNumbers,
+	          "",
+	          "");
 	I_Method1(osg::ref_ptr< osg::Referenced > &, getDatabaseRequest, IN, unsigned int, childNo,
 	          Properties::NON_VIRTUAL,
 	          __osg_ref_ptrT1_osg_Referenced__R1__getDatabaseRequest__unsigned_int,
@@ -193,10 +208,10 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
 	          __unsigned_int__getNumChildrenThatCannotBeExpired,
 	          "Get the number of children that the PagedLOD must keep around, even if they are older than their expiry time. ",
 	          "");
-	I_Method2(bool, removeExpiredChildren, IN, double, expiryTime, IN, osg::NodeList &, removedChildren,
+	I_Method3(bool, removeExpiredChildren, IN, double, expiryTime, IN, int, expiryFrame, IN, osg::NodeList &, removedChildren,
 	          Properties::VIRTUAL,
-	          __bool__removeExpiredChildren__double__NodeList_R1,
+	          __bool__removeExpiredChildren__double__int__NodeList_R1,
-	          "Remove the children from the PagedLOD which haven't been visited since specified expiry time. ",
+	          "Remove the children from the PagedLOD which haven't been visited since specified expiry time and expiry frame number. ",
 	          "The removed children are added to the removeChildren list passed into the method, this allows the children to be deleted later at the caller's discretion. Return true if children are removed, false otherwise. ");
 	I_ProtectedMethod1(void, expandPerRangeDataTo, IN, unsigned int, pos,
 	                   Properties::NON_VIRTUAL,
@@ -214,6 +229,13 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD)
 	                0, 
 	                0, 
 	                0);
+	I_ArrayProperty(double, FrameNumber, 
+	                __double__getFrameNumber__unsigned_int, 
+	                0, 
+	                __unsigned_int__getNumFrameNumbers, 
+	                0, 
+	                0, 
+	                0);
 	I_SimpleProperty(int, FrameNumberOfLastTraversal, 
 	                 __int__getFrameNumberOfLastTraversal, 
 	                 __void__setFrameNumberOfLastTraversal__int);
@@ -257,6 +279,7 @@ BEGIN_VALUE_REFLECTOR(osg::PagedLOD::PerRangeData)
 	I_PublicMemberProperty(float, _priorityOffset);
 	I_PublicMemberProperty(float, _priorityScale);
 	I_PublicMemberProperty(double, _timeStamp);
+	I_PublicMemberProperty(int, _frameNumber);
 	I_PublicMemberProperty(osg::ref_ptr< osg::Referenced >, _databaseRequest);
 END_REFLECTOR
 

src/osgWrappers/osgDB/DatabasePager.cpp

@@ -204,6 +204,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
 	          __double__getExpiryDelay,
 	          "Get the amount of time that a subgraph will be kept without being visited in the cull traversal before being removed. ",
 	          "");
+	I_Method1(void, setExpiryFrames, IN, int, expiryFrames,
+	          Properties::NON_VIRTUAL,
+	          __void__setExpiryFrames__int,
+	          "Set the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ",
+	          "");
+	I_Method0(int, getExpiryFrames,
+	          Properties::NON_VIRTUAL,
+	          __int__getExpiryFrames,
+	          "Get the number of frames that a subgraph will be kept without being visited in the cull traversal before being removed. ",
+	          "");
 	I_Method1(void, setDeleteRemovedSubgraphsInDatabaseThread, IN, bool, flag,
 	          Properties::NON_VIRTUAL,
 	          __void__setDeleteRemovedSubgraphsInDatabaseThread__bool,
@@ -249,9 +259,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
 	          __bool__requiresUpdateSceneGraph,
 	          "Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). ",
 	          "");
-	I_Method1(void, updateSceneGraph, IN, double, currentFrameTime,
+	I_Method1(void, updateSceneGraph, IN, const osg::FrameStamp &, frameStamp,
 	          Properties::VIRTUAL,
-	          __void__updateSceneGraph__double,
+	          __void__updateSceneGraph__C5_osg_FrameStamp_R1,
 	          "Merge the changes to the scene graph by calling calling removeExpiredSubgraphs then addLoadedDataToSceneGraph. ",
 	          "Note, must only be called from single thread update phase. ");
 	I_Method2(void, setCompileGLObjectsForContextID, IN, unsigned int, contextID, IN, bool, on,
@@ -340,16 +350,16 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
 	                   __bool__isCompiled__C5_osg_Drawable_P1,
 	                   "",
 	                   "");
-	I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, double, currentFrameTime,
+	I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, const osg::FrameStamp &, frameStamp,
 	                   Properties::VIRTUAL,
 	                   Properties::NON_CONST,
-	                   __void__removeExpiredSubgraphs__double,
+	                   __void__removeExpiredSubgraphs__C5_osg_FrameStamp_R1,
 	                   "Iterate through the active PagedLOD nodes children removing children which havn't been visited since specified expiryTime. ",
 	                   "note, should be only be called from the update thread. ");
-	I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, double, currentFrameTime,
+	I_ProtectedMethod1(void, addLoadedDataToSceneGraph, IN, const osg::FrameStamp &, frameStamp,
 	                   Properties::NON_VIRTUAL,
 	                   Properties::NON_CONST,
-	                   __void__addLoadedDataToSceneGraph__double,
+	                   __void__addLoadedDataToSceneGraph__C5_osg_FrameStamp_R1,
 	                   "Add the loaded data to the scene graph. ",
 	                   "");
 	I_SimpleProperty(bool, AcceptNewDatabaseRequests, 
@@ -387,6 +397,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
 	I_SimpleProperty(double, ExpiryDelay, 
 	                 __double__getExpiryDelay, 
 	                 __void__setExpiryDelay__double);
+	I_SimpleProperty(int, ExpiryFrames, 
+	                 __int__getExpiryFrames, 
+	                 __void__setExpiryFrames__int);
 	I_SimpleProperty(unsigned int, FileRequestListSize, 
 	                 __unsigned_int__getFileRequestListSize, 
 	                 0);

src/osgWrappers/osgDB/ImagePager.cpp

@@ -69,9 +69,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ImagePager)
 	          __bool__requiresUpdateSceneGraph,
 	          "Return true if there are pending updates to the scene graph that require a call to updateSceneGraph(double). ",
 	          "");
-	I_Method1(void, updateSceneGraph, IN, double, currentFrameTime,
+	I_Method1(void, updateSceneGraph, IN, const osg::FrameStamp &, frameStamp,
 	          Properties::VIRTUAL,
-	          __void__updateSceneGraph__double,
+	          __void__updateSceneGraph__C5_osg_FrameStamp_R1,
 	          "Merge the changes to the scene graph. ",
 	          "");
 	I_Method0(int, cancel,

src/osgWrappers/osgViewer/GraphicsWindow.cpp

@@ -131,6 +131,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow)
 	          __void__grabFocusIfPointerInWindow,
 	          "Get focus on if the pointer is in this window. ",
 	          "");
+	I_Method0(void, raiseWindow,
+	          Properties::VIRTUAL,
+	          __void__raiseWindow,
+	          "Raise the window to the top. ",
+	          "");
 	I_Method1(void, setWindowName, IN, const std::string &, x,
 	          Properties::VIRTUAL,
 	          __void__setWindowName__C5_std_string_R1,
@@ -305,6 +310,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindowEmbedded)
 	          __void__grabFocusIfPointerInWindow,
 	          "Get focus on if the pointer is in this window. ",
 	          "");
+	I_Method0(void, raiseWindow,
+	          Properties::VIRTUAL,
+	          __void__raiseWindow,
+	          "Raise the window to the top. ",
+	          "");
 END_REFLECTOR
 
 BEGIN_VALUE_REFLECTOR(osgViewer::GraphicsWindowFunctionProxy)