diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 7629dd4286..9c07cd7b1a 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.2 +# Doxyfile 1.8.8 #--------------------------------------------------------------------------- # Project Options @@ -11,6 +11,7 @@ PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out CREATE_SUBDIRS = NO +ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES @@ -45,7 +46,6 @@ SUBGROUPING = YES INLINE_GROUPED_CLASSES = NO # TODO: Examine this setting. INLINE_SIMPLE_STRUCTS = NO # TODO: Examine this setting. TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 LOOKUP_CACHE_SIZE = 0 @@ -248,6 +248,7 @@ INTERNAL_DOCS = NO CASE_SENSE_NAMES = NO # Default: YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES +SHOW_GROUPED_MEMB_INC = NO # TODO: YES FORCE_LOCAL_INCLUDES = NO INLINE_INFO = YES SORT_MEMBER_DOCS = YES @@ -260,10 +261,8 @@ GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES - -# can contain WXPERL_MANUAL, WXPYTHON_MANUAL keywords -ENABLED_SECTIONS = WXPERL_MANUAL WXPYTHON_MANUAL - +ENABLED_SECTIONS = WXPERL_MANUAL \ + WXPYTHON_MANUAL MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = NO # Default: YES SHOW_FILES = YES @@ -290,7 +289,10 @@ WARN_LOGFILE = doxygen.log # Input File Options #--------------------------------------------------------------------------- -INPUT = mainpages groups overviews ../../interface +INPUT = mainpages \ + groups \ + overviews \ + ../../interface INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h RECURSIVE = YES # Default: NO @@ -306,6 +308,7 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO FILTER_SOURCE_PATTERNS = +USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- @@ -318,6 +321,7 @@ STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = NO REFERENCES_RELATION = NO REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES USE_HTAGS = NO VERBATIM_HEADERS = NO # Default: YES @@ -349,18 +353,6 @@ HTML_COLORSTYLE_GAMMA = 100 # Default: 80 HTML_TIMESTAMP = YES HTML_DYNAMIC_SECTIONS = YES # Default: NO HTML_INDEX_NUM_ENTRIES = 100 -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 1 # Default: 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -EXT_LINKS_IN_WINDOW = YES # Default: NO -FORMULA_FONTSIZE = 10 -FORMULA_TRANSPARENT = YES -USE_MATHJAX = NO -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest -MATHJAX_EXTENSIONS = -SEARCHENGINE = $(SEARCHENGINE) -SERVER_BASED_SEARCH = $(SERVER_BASED_SEARCH) #--------------------------------------------------------------------------- @@ -371,7 +363,7 @@ GENERATE_DOCSET = $(GENERATE_DOCSET) DOCSET_FEEDNAME = "wxWidgets 3.1" DOCSET_BUNDLE_ID = org.wxwidgets.doxygen.wx31 DOCSET_PUBLISHER_ID = org.wxwidgets.doxygen -DOCSET_PUBLISHER_NAME = wxWidgets Team +DOCSET_PUBLISHER_NAME = wxWidgets #--------------------------------------------------------------------------- @@ -409,6 +401,31 @@ GENERATE_ECLIPSEHELP = NO ECLIPSE_DOC_ID = org.wxwidgets.doxygen +#--------------------------------------------------------------------------- +# Other Output Options +#--------------------------------------------------------------------------- + +DISABLE_INDEX = NO +GENERATE_TREEVIEW = NO +ENUM_VALUES_PER_LINE = 1 # Default: 4 +TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = YES # Default: NO +FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES +USE_MATHJAX = NO +MATHJAX_FORMAT = HTML-CSS +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = +SEARCHENGINE = $(SEARCHENGINE) +SERVER_BASED_SEARCH = $(SERVER_BASED_SEARCH) +EXTERNAL_SEARCH = NO +SEARCHENGINE_URL = +SEARCHDATA_FILE = searchdata.xml +EXTERNAL_SEARCH_ID = +EXTRA_SEARCH_MAPPINGS = + + #--------------------------------------------------------------------------- # LaTeX Output Options #--------------------------------------------------------------------------- @@ -422,6 +439,7 @@ PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = latexdocstart.inc LATEX_FOOTER = +LATEX_EXTRA_FILES = PDF_HYPERLINKS = YES USE_PDFLATEX = YES LATEX_BATCHMODE = YES # Default: NO @@ -449,6 +467,7 @@ RTF_EXTENSIONS_FILE = GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 +MAN_SUBDIR = MAN_LINKS = NO @@ -458,11 +477,18 @@ MAN_LINKS = NO GENERATE_XML = $(GENERATE_XML) XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = XML_PROGRAMLISTING = NO # Default: YES +#--------------------------------------------------------------------------- +# DOCBOOK Output Options +#--------------------------------------------------------------------------- + +GENERATE_DOCBOOK = NO +DOCBOOK_OUTPUT = docbook +DOCBOOK_PROGRAMLISTING = NO + + #--------------------------------------------------------------------------- # AutoGen Definitions Output Options #--------------------------------------------------------------------------- @@ -490,7 +516,8 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = wxUSE_BASE wxUSE_GUI +PREDEFINED = wxUSE_BASE \ + wxUSE_GUI EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES @@ -503,6 +530,7 @@ TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES +EXTERNAL_PAGES = YES PERL_PATH = /usr/bin/perl @@ -512,10 +540,11 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES MSCGEN_PATH = +DIA_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES # Default: NO DOT_NUM_THREADS = 0 -DOT_FONTNAME = FreeSans # Default: Helvetica +DOT_FONTNAME = DOT_FONTSIZE = 10 DOT_FONTPATH = CLASS_GRAPH = YES @@ -532,16 +561,14 @@ GRAPHICAL_HIERARCHY = NO # TODO: Default: YES DIRECTORY_GRAPH = NO # Default: YES DOT_IMAGE_FORMAT = png INTERACTIVE_SVG = NO +DOT_PATH = DOTFILE_DIRS = MSCFILE_DIRS = +DIAFILE_DIRS = +PLANTUML_JAR_PATH = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 1000 # Default: 0 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES - -# Instead of setting a value for DOT_PATH it's easier and more portable to -# put your dot utility in the PATH. On Windows you'll need to install GraphViz -# tools, and then manually add it to the PATH environment variable. -DOT_PATH = diff --git a/docs/doxygen/extra_stylesheet.css b/docs/doxygen/extra_stylesheet.css index 99e2cb67a2..59fd6ba3a1 100644 --- a/docs/doxygen/extra_stylesheet.css +++ b/docs/doxygen/extra_stylesheet.css @@ -27,7 +27,8 @@ div.contents, div.searchresults { } #projectnumber { - font: 120% Tahoma, Arial, sans-serif; + font-size: 120%; + font-family: Tahoma, Arial, sans-serif; text-align: right; padding: 0.5em 1em; } @@ -99,6 +100,14 @@ div.logo { margin: 20px; } +table.directory { + line-height: 1.5; +} + +.icon { + line-height: 1.25; +} + div.appearance { margin: 1em 0em; } diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index 21fc4c1f23..ef8028addc 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -14,7 +14,7 @@ @author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor, Bryan Petty, Francesco Montorsi, Robert Roebling et al -@date November 11, 2013 +@date November 19, 2014 @n diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh index a287ee06f7..f644ef0f41 100755 --- a/docs/doxygen/regen.sh +++ b/docs/doxygen/regen.sh @@ -38,11 +38,10 @@ fi # Check that doxygen has the correct version as different versions of it are # unfortunately not always (in fact, practically never) compatible. # -# Still allow using incompatible version for some quick local testing if really -# needed and 1.8.2 can't be installed for whatever reason. +# Still allow using incompatible version if explicitly requested. if [[ -z $WX_SKIP_DOXYGEN_VERSION_CHECK ]]; then doxygen_version=`$DOXYGEN --version` - doxygen_version_required=1.8.2 + doxygen_version_required=1.8.8 if [[ $doxygen_version != $doxygen_version_required ]]; then echo "Doxygen version $doxygen_version is not supported." echo "Please use Doxygen $doxygen_version_required or export WX_SKIP_DOXYGEN_VERSION_CHECK."