One last navigation tab font adjustment, and made search input only generate for...

All formats default to off, and need to be explicitly turned on in alternate configuration files (settings can be overridden).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/doxygen/Doxyfile_all b/docs/doxygen/Doxyfile_all
index 1090adb3c6debf3cdbca67700405f8e318d9e13d..55d89e5810610dba4f1c3a8b72eece703a1d4d94 100644 (file)
--- a/docs/doxygen/Doxyfile_all
+++ b/docs/doxygen/Doxyfile_all
@@ -12,16 +12,15 @@
 # Generation switches
 #---------------------------------------------------------------------------
 
-GENERATE_HTMLHELP      = YES
-GENERATE_HTML          = YES
-GENERATE_XML           = YES
+# This file generates all the official formats we distribute.
 
+GENERATE_HTML          = YES
+GENERATE_HTMLHELP      = YES
 GENERATE_LATEX         = NO
 GENERATE_RTF           = NO
 GENERATE_MAN           = NO
-GENERATE_PERLMOD       = YES
+GENERATE_XML           = YES
 GENERATE_AUTOGEN_DEF   = NO
-GENERATE_TAGFILE       =
+GENERATE_PERLMOD       = YES
+GENERATE_TAGFILE       = NO
 
-# see Doxyfile_chm for more info about hhc.exe and where to get it!
-HHC_LOCATION           = hhc.exe

diff --git a/docs/doxygen/Doxyfile_chm b/docs/doxygen/Doxyfile_chm
index 325ab1915af4c73b5741639ad346ff6f937dcc1f..dd248609a95b73d9e25be5f5bf55b6973d57fd3e 100644 (file)
--- a/docs/doxygen/Doxyfile_chm
+++ b/docs/doxygen/Doxyfile_chm
@@ -8,41 +8,31 @@
 
 @INCLUDE = Doxyfile_inc
 
+# HTML Help Compiler (hhc.exe) is the compiler used to produce CHM files from
+# the HTML sources. You are required to install HHC to generate this format.
+#
+# Windows:
+#   You can download it for free from MS website:
+#   <http://www.microsoft.com/downloads/details.aspx?FamilyID=00535334-c8a6-452f-9aa0-d597d16580cc&displaylang=en>
+#   Then set the HHC_PATH environment variable to the folder where you
+#   installed HHC. See <http://www.computerhope.com/issues/ch000549.htm>
+#   for more info about how to set env variables in WinXP or newer.
+#
+# Unix:
+#   You can install the Windows version of the compiler under WINE
+#   <http://www.winehq.org/> following the instructions placed here:
+#   <http://appdb.winehq.org/objectManager.php?sClass=application&iId=2140>
+#   Then place the hhc.exe executable in your PATH. You can add to your
+#   ~/.bashrc (if you use bash):
+#     PATH=$PATH:~/.wine/drive_c/Program Files/HTML Help Workshop
+#     export PATH
+
 #---------------------------------------------------------------------------
 # Generation switches
 #---------------------------------------------------------------------------
 
-GENERATE_HTMLHELP      = YES
-
-# NOTE: the following must be set to YES otherwise doxygen won't generate the 
+# NOTE: GENERATE_HTML must be set to YES otherwise doxygen won't generate the
 #       index.hhp file and the CHM compilation will fail!
 GENERATE_HTML          = YES
-GENERATE_XML           = NO
-
-GENERATE_LATEX         = NO
-GENERATE_RTF           = NO
-GENERATE_MAN           = NO
-GENERATE_PERLMOD       = NO
-GENERATE_AUTOGEN_DEF   = NO
-GENERATE_TAGFILE       =
+GENERATE_HTMLHELP      = YES
 
-# Notes about the HTML HELP COMPILER (hhc):
-# hhc is the compiler used to produce CHM files from the HTML sources.
-#
-# => for Windows:
-#    you can download it for free from MS website:
-#      http://www.microsoft.com/downloads/details.aspx?FamilyID=00535334-c8a6-452f-9aa0-d597d16580cc&displaylang=en
-#    then set the HHC_PATH environment variable to the folder where you
-#    installed HHC; see e.g. http://www.computerhope.com/issues/ch000549.htm
-#    for more info about how to set env variables in WinXP or newer.
-#
-# => for Unix: 
-#    you can install the Windows version of the compiler under WINE 
-#    (http://www.winehq.org/) following the instructions placed here:
-#      http://appdb.winehq.org/objectManager.php?sClass=application&iId=2140
-#    then you can place hhc.exe executable in your PATH; e.g. you can add to
-#    your ~/.bashrc (if you use bash): 
-#      PATH=$PATH:~/.wine/drive_c/Programmi/HTMLHelpWorkshop
-#      export PATH
-#
-HHC_LOCATION           = hhc.exe

diff --git a/docs/doxygen/Doxyfile_html b/docs/doxygen/Doxyfile_html
index 2f89afd705d901768872bfd44c04d0d8794c24db..91803f4302113d55063a18bb8f3877f4e7502129 100644 (file)
--- a/docs/doxygen/Doxyfile_html
+++ b/docs/doxygen/Doxyfile_html
@@ -12,15 +12,6 @@
 # Generation switches
 #---------------------------------------------------------------------------
 
-GENERATE_HTMLHELP      = NO
 GENERATE_HTML          = YES
-GENERATE_XML           = NO
+SEARCHENGINE           = YES
 
-GENERATE_LATEX         = NO
-GENERATE_RTF           = NO
-GENERATE_MAN           = NO
-GENERATE_PERLMOD       = NO
-GENERATE_AUTOGEN_DEF   = NO
-GENERATE_TAGFILE       =
-
-HHC_LOCATION           =

diff --git a/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc
index 649c71c0b1647b2cb21dd8d164fa384e131b75eb..2fb298c0953a3955383d290b77eda308834af5e6 100644 (file)
--- a/docs/doxygen/Doxyfile_inc
+++ b/docs/doxygen/Doxyfile_inc
@@ -250,14 +250,17 @@ IGNORE_PREFIX          = wx
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
+GENERATE_HTML          = NO # Only change in format output configs
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = htmlheader.inc
 HTML_FOOTER            = htmlfooter.inc
 HTML_STYLESHEET        =
 HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO # Only change in format output configs
 HTML_DYNAMIC_SECTIONS  = YES
-CHM_FILE               = ..\wx.chm      # NOTE: we need to use Win-style separator here
+CHM_FILE               = ..\wx.chm # NOTE: Windows style separator needed
+HHC_LOCATION           = hhc.exe # Don't modify, see Doxyfile_chm for info
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
@@ -269,6 +272,7 @@ TREEVIEW_WIDTH         = 250
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
+GENERATE_LATEX         = NO # Only change in format output configs
 LATEX_OUTPUT           = latex
 LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
@@ -284,6 +288,7 @@ LATEX_HIDE_INDICES     = NO
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
+GENERATE_RTF           = NO # Only change in format output configs
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
@@ -293,6 +298,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
+GENERATE_MAN           = NO # Only change in format output configs
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
@@ -300,6 +306,7 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
+GENERATE_XML           = NO # Only change in format output configs
 XML_OUTPUT             = xml
 XML_SCHEMA             =
 XML_DTD                =
@@ -308,12 +315,12 @@ XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
-
+GENERATE_AUTOGEN_DEF   = NO # Only change in format output configs
 
 #---------------------------------------------------------------------------
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
+GENERATE_PERLMOD       = NO # Only change in format output configs
 PERLMOD_LATEX          = YES
 PERLMOD_PRETTY         = YES
 PERLMOD_MAKEVAR_PREFIX =
@@ -335,6 +342,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
@@ -370,4 +378,5 @@ DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO
+

diff --git a/docs/doxygen/Doxyfile_latex b/docs/doxygen/Doxyfile_latex
index a98afcdadb1114b129a0ccc23a76fc31f80b104d..c06e1beb3b633b5eebf9bd6ec9e2aa199e4508cf 100644 (file)
--- a/docs/doxygen/Doxyfile_latex
+++ b/docs/doxygen/Doxyfile_latex
@@ -12,15 +12,5 @@
 # Generation switches
 #---------------------------------------------------------------------------
 
-GENERATE_HTMLHELP      = NO
-GENERATE_HTML          = NO
-GENERATE_XML           = NO
-
 GENERATE_LATEX         = YES
-GENERATE_RTF           = NO
-GENERATE_MAN           = NO
-GENERATE_PERLMOD       = NO
-GENERATE_AUTOGEN_DEF   = NO
-GENERATE_TAGFILE       =
 
-HHC_LOCATION           =

diff --git a/docs/doxygen/Doxyfile_xml b/docs/doxygen/Doxyfile_xml
index 6e1272352d4bd8ea87db9f69586add66d3a5f17c..37c94ca69d716e559213d5846f0807e3a3fd40c7 100644 (file)
--- a/docs/doxygen/Doxyfile_xml
+++ b/docs/doxygen/Doxyfile_xml
@@ -12,15 +12,5 @@
 # Generation switches
 #---------------------------------------------------------------------------
 
-GENERATE_HTMLHELP      = NO
-GENERATE_HTML          = NO
 GENERATE_XML           = YES
 
-GENERATE_LATEX         = NO
-GENERATE_RTF           = NO
-GENERATE_MAN           = NO
-GENERATE_PERLMOD       = NO
-GENERATE_AUTOGEN_DEF   = NO
-GENERATE_TAGFILE       =
-
-HHC_LOCATION           =

diff --git a/docs/doxygen/wxwidgets.css b/docs/doxygen/wxwidgets.css
index 91aab50d020121923406335b4691b017c8dc8f0a..8ec3c853e7e0a5f94ecc21fb51221e43f0f6d26c 100644 (file)
--- a/docs/doxygen/wxwidgets.css
+++ b/docs/doxygen/wxwidgets.css
@@ -495,7 +495,10 @@ A[HREF="modules.html"] SPAN:before {
        content: "Categories / ";
 }
 
+/* Doxygen defaults the top navigation tabs to a small, bold font,
+   so we reset it here to a larger, normal font. */
 DIV.navigation A SPAN {
-       font-size: 110%;
+       font-size: 120%;
+       font-weight: normal;
 }