diff --git a/docs/doxygen/Doxyfile_html b/docs/doxygen/Doxyfile_html index dc4cf7e106..d761b7c8bc 100644 --- a/docs/doxygen/Doxyfile_html +++ b/docs/doxygen/Doxyfile_html @@ -14,4 +14,5 @@ GENERATE_HTML = YES SEARCHENGINE = YES +SERVER_BASED_SEARCH = NO diff --git a/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc index 18f0cd0704..796a80d479 100644 --- a/docs/doxygen/Doxyfile_inc +++ b/docs/doxygen/Doxyfile_inc @@ -13,6 +13,8 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets PROJECT_NUMBER = 2.9.3 +PROJECT_BRIEF = +PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -321,16 +323,24 @@ IGNORE_PREFIX = wx 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_HEADER = custom_header.html +HTML_FOOTER = custom_footer.html +HTML_STYLESHEET = custom_stylesheet.css +HTML_EXTRA_FILES = +HTML_COLORSTYLE_HUE = +HTML_COLORSTYLE_SAT = 255 +HTML_COLORSTYLE_GAMMA = 100 +HTML_TIMESTAMP = YES HTML_ALIGN_MEMBERS = YES HTML_DYNAMIC_SECTIONS = YES DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 1 -GENERATE_TREEVIEW = NONE +GENERATE_TREEVIEW = NO +USE_INLINE_TREES = NO TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = YES FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES #--------------------------------------------------------------------------- # configuration options related to the CHM output diff --git a/docs/doxygen/custom_footer.html b/docs/doxygen/custom_footer.html new file mode 100644 index 0000000000..63b43891c0 --- /dev/null +++ b/docs/doxygen/custom_footer.html @@ -0,0 +1,21 @@ + +
  • + Page generated on $datetime by + Doxygen $doxygenversion
    • + + + + +
    +
    + + Page generated on $datetime by + Doxygen $doxygenversion + +
    + + + + + + diff --git a/docs/doxygen/custom_header.html b/docs/doxygen/custom_header.html new file mode 100644 index 0000000000..0cd60cddcc --- /dev/null +++ b/docs/doxygen/custom_header.html @@ -0,0 +1,37 @@ + + + + + +$projectname: $title +$title + + +$treeview +$search +$mathjax + + +
    + + +
    + + + + + + + + + + + + + + +
    + Version: $projectnumber + $searchbox
    +
    + diff --git a/docs/doxygen/custom_stylesheet.css b/docs/doxygen/custom_stylesheet.css new file mode 100644 index 0000000000..e755d7fe3d --- /dev/null +++ b/docs/doxygen/custom_stylesheet.css @@ -0,0 +1,1027 @@ +/***************************************************************************** +** Name: custom_stylesheet.css +** Purpose: The wxWidgets documentation CSS; a customized version of +** the standard Doxygen CSS +** Author: Doxygen team +** RCS-ID: $Id$ +** Licence: wxWindows licence +*****************************************************************************/ + +body, table, div, p, dl { + font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif; + font-size: 13px; + line-height: 1.5; +} + +/* @group Heading Levels */ + +h1 { + font-size: 150%; +} + +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd, p.starttd { + margin-top: 2px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #4665A2; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code { + color: #4665A2; +} + +a.codeRef { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +.fragment { + font-family: monospace, fixed; + font-size: 105%; +} + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background-color: white; + color: black; + margin: 0; +} + +div.contents { + margin-top: 10px; + margin-left: 8px; + margin-right: 8px; +} + +td.indexkey { + background-color: #EBEFF6; + font-weight: bold; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; + white-space: nowrap; + vertical-align: top; +} + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #EEF1F7; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +address.footer { + margin: 1em; + text-align: right; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; +} + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; +} + +hr.footer { + height: 1px; + margin: 2em 0em 0em 0em; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; +} + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memItemLeft, .memItemRight, .memTemplParams { + border-top: 1px solid #C4CFE5; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memItemRight { + width: 100%; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.mempage { + width: 100%; +} + +.memitem { + padding: 0; + margin-bottom: 10px; + margin-right: 5px; +} + +.memname { + white-space: nowrap; + font-weight: bold; + margin-left: 6px; +} + +.memproto, dl.reflist dt { + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 8px; + border-top-left-radius: 8px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 8px; + -webkit-border-top-left-radius: 8px; + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #CBDCFE; + +} + +.memdoc, dl.reflist dd { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 2px 5px; + background-color: #FBFCFD; + border-top-width: 0; + /* opera specific markup */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 8px; + -moz-border-radius-bottomright: 8px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7); + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 8px; + -webkit-border-bottom-right-radius: 8px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7)); +} + +dl.reflist dt { + padding: 5px; +} + +dl.reflist dd { + margin: 0px 0px 10px 0px; + padding: 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} + +.params, .retval, .exception, .tparams { + border-spacing: 6px 2px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; +} + + + + +/* @end */ + +/* @group Directory (tree) */ + +/* for the tree view */ + +.ftvtree { + font-family: sans-serif; + margin: 0px; +} + +/* these are for tree view when used as main index */ + +.directory { + font-size: 9pt; + font-weight: bold; + margin: 5px; +} + +.directory h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +/* +The following two styles can be used to replace the root node title +with an image of your choice. Simply uncomment the next two styles, +specify the name of your image and be sure to set 'height' to the +proper pixel height of your image. +*/ + +/* +.directory h3.swap { + height: 61px; + background-repeat: no-repeat; + background-image: url("yourimage.gif"); +} +.directory h3.swap span { + display: none; +} +*/ + +.directory > h3 { + margin-top: 0; +} + +.directory p { + margin: 0px; + white-space: nowrap; +} + +.directory div { + display: none; + margin: 0px; +} + +.directory img { + vertical-align: -30%; +} + +/* these are for tree view when not used as main index */ + +.directory-alt { + font-size: 100%; + font-weight: bold; +} + +.directory-alt h3 { + margin: 0px; + margin-top: 1em; + font-size: 11pt; +} + +.directory-alt > h3 { + margin-top: 0; +} + +.directory-alt p { + margin: 0px; + white-space: nowrap; +} + +.directory-alt div { + display: none; + margin: 0px; +} + +.directory-alt img { + vertical-align: -30%; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; +} + +table.fieldtable { + width: 100%; + margin-bottom: 10px; + border: 1px solid #A8B8D9; + border-spacing: 0px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); +} + +.fieldtable td, .fieldtable th { + padding: 3px 7px 2px; +} + +.fieldtable td.fieldtype, .fieldtable td.fieldname { + white-space: nowrap; + border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + vertical-align: top; +} + +.fieldtable td.fielddoc { + border-bottom: 1px solid #A8B8D9; + width: 100%; +} + +.fieldtable tr:last-child td { + border-bottom: none; +} + +.fieldtable th { + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + font-size: 90%; + color: #253555; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #A8B8D9; +} + + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + margin-left: 5px; + font-size: 8pt; + padding-left: 5px; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 7px; +} + +dl +{ + padding: 0 0 0 10px; +} + +dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug +{ + border-left:4px solid; + padding: 0 0 0 6px; +} + +dl.note +{ + border-color: #D0C000; +} + +dl.warning, dl.attention +{ + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + border-color: #00D000; +} + +dl.deprecated +{ + border-color: #505050; +} + +dl.todo +{ + border-color: #00C0E0; +} + +dl.test +{ + border-color: #3030E0; +} + +dl.bug +{ + border-color: #C08050; +} + +#projectlogo +{ + padding: 0.5em; + text-align: left; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + font: 300% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 2px 0px; +} + +#projectbrief +{ + font: 120% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#projectnumber +{ + font: 120% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0.5em; +} + +#titlearea +{ + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; +} + +.image +{ + text-align: center; +} + +.dotgraph +{ + text-align: center; +} + +.mscgraph +{ + text-align: center; +} + +.caption +{ + font-weight: bold; +} + +div.zoom +{ + border: 1px solid #90A5CE; +} + +dl.citelist { + margin-bottom:50px; +} + +dl.citelist dt { + color:#334975; + float:left; + font-weight:bold; + margin-right:10px; + padding:5px; +} + +dl.citelist dd { + margin:2px 0; + padding:5px 0; +} + +@media print +{ + #top { display: none; } + #side-nav { display: none; } + #nav-path { display: none; } + body { overflow:visible; } + h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } + .summary { display: none; } + .memitem { page-break-inside: avoid; } + #doc-content + { + margin-left:0 !important; + height:auto !important; + width:auto !important; + overflow:inherit; + display:inline; + } + pre.fragment + { + overflow: visible; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; /* Moz */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS3 */ + word-wrap: break-word; /* IE 5.5+ */ + } +} + + + + +/* + wxWidgets docs specific styles + ============================== +*/ + +img.logo { + float: right; + margin: 20px; +} + +img.appearance { + margin: 20px; +} + +table.appearance { + width: 100%; + text-align: center; + font-style: italic; + font-size: 90%; + /*font-weight: bold;*/ +} + +td.green { color: green; } +td.orange { color: #ff8000; } +td.red { color: red; } + +span.literal { + text-decoration: none; + font-weight: bold; + font-family: monospace, fixed; +} + +/* we make all the following tags render the text just like + the standard Doxygen @remarks, @see tags do, to obtain a uniform + look and feel */ +span.itemdef, span.lib, span.category, span.stdobj, span.styles, +span.events, span.flags, span.appearance, span.impl, span.avail { + font-weight: bold; + line-height: 130%; +} + +span.style, span.event, span.flag { + font-weight: bold; + color: #880000; +} + +div.styleDesc, div.eventDesc, div.flagDesc { + margin-left: 3%; + margin-bottom: 1ex; +} + +div.eventHandler { + margin: 1em; + text-indent: 3%; +} + +div.eventHandler span { + padding: 5px; + background-color: #eeeeee; + font-family: monospace, fixed; +} + +code { + font-size: 110%; + color: #444444; +} diff --git a/docs/doxygen/htmlfooter.inc b/docs/doxygen/htmlfooter.inc deleted file mode 100644 index b7fa53d103..0000000000 --- a/docs/doxygen/htmlfooter.inc +++ /dev/null @@ -1,25 +0,0 @@ - - - - -


    - - - - - - - -
    - - wxWidgets logo - -

    Page generated $datetime by Doxygen $doxygenversion

    [ top ]

    - - - - - - - - diff --git a/docs/doxygen/htmlheader.inc b/docs/doxygen/htmlheader.inc deleted file mode 100644 index d972448929..0000000000 --- a/docs/doxygen/htmlheader.inc +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - $title - - - - - - - - - - - - diff --git a/docs/doxygen/logo.png b/docs/doxygen/logo.png new file mode 100644 index 0000000000..f0d4a7fa1b Binary files /dev/null and b/docs/doxygen/logo.png differ diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index 6d28779f2b..9ebc8f40cd 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -9,7 +9,7 @@ /** -@mainpage Reference manual +@mainpage Documentation @author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn, Stefan Csomor, Francesco Montorsi, Bryan Petty, et al @date December, 2011 diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat index 8852f69fe0..3492e24e3c 100644 --- a/docs/doxygen/regen.bat +++ b/docs/doxygen/regen.bat @@ -24,11 +24,6 @@ copy images\wxmsw\*.png out\html\wxmsw 2>&1 >NUL copy images\wxmac\*.png out\html\wxmac 2>&1 >NUL copy wxwidgets.js out\html 2>&1 >NUL -REM these CSS are not automatically copied by Doxygen because they're -REM included by our custom html header... -copy wxwidgets.css out\html 2>&1 >NUL -copy wxtabs.css out\html 2>&1 >NUL - REM set cfgfile variable to the right doxyfile to use, REM using MS broken batch scripting setlocal enableextensions diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh index 40e2a68f5e..0fb2719122 100755 --- a/docs/doxygen/regen.sh +++ b/docs/doxygen/regen.sh @@ -38,11 +38,6 @@ cp images/wxgtk/*png out/html/wxgtk cp images/generic/*png out/html/generic cp wxwidgets.js out/html -# these CSS are not automatically copied by Doxygen because they're -# included by our custom html header... -cp wxwidgets.css out/html -cp wxtabs.css out/html - # which configuration should we use? if [[ -z "$1" ]]; then cfgfile="Doxyfile_all" @@ -146,10 +141,8 @@ fi # more readable currpath=`pwd`/ interfacepath=`cd ../../interface && pwd`/ -cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" >temp - -# Doxygen warnings are not completely sorted for filename; enforce correct sorting: -cat temp | sort >doxygen.log +cat doxygen.log | sed -e "s|$currpath||g" -e "s|$interfacepath||g" > temp +cat temp > doxygen.log rm temp # return to the original folder from which this script was launched diff --git a/docs/doxygen/wxtabs.css b/docs/doxygen/wxtabs.css deleted file mode 100644 index 91ac28e79e..0000000000 --- a/docs/doxygen/wxtabs.css +++ /dev/null @@ -1,217 +0,0 @@ -/***************************************************************************** -** Name: wxtabs.css -** Purpose: The wxWidgets documentation CSS -** Author: Doxygen team -** RCS-ID: $Id$ -** Licence: wxWindows licence -*****************************************************************************/ - -/* - Doxygen classic tabs styles, based on http://www.alistapart.com/articles/slidingdoors -*/ - -DIV.tabs -{ - float : left; - width : 100%; - background : url("tab_b.gif") repeat-x bottom; - margin-bottom : 4px; -} - -DIV.tabs UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; -} - -DIV.tabs LI, DIV.tabs FORM -{ - display : inline; - margin : 0px; - padding : 0px; -} - -DIV.tabs FORM -{ - float : right; -} - -DIV.tabs A -{ - float : left; - background : url("tab_r.gif") no-repeat right top; - border-bottom : 1px solid #84B0C7; - font-size : 80%; - font-weight : bold; - text-decoration : none; -} - -DIV.tabs A:hover -{ - background-position: 100% -150px; -} - -DIV.tabs A:link, DIV.tabs A:visited, -DIV.tabs A:active, DIV.tabs A:hover -{ - color: #1A419D; -} - -DIV.tabs SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; -} - -DIV.tabs INPUT -{ - float : right; - display : inline; - font-size : 1em; -} - -DIV.tabs TD -{ - font-size : 80%; - font-weight : bold; - text-decoration : none; -} - - - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -DIV.tabs SPAN {float : none;} -/* End IE5-Mac hack */ - -DIV.tabs A:hover SPAN -{ - background-position: 0% -150px; -} - -DIV.tabs LI.current A -{ - background-position: 100% -150px; - border-width : 0px; -} - -DIV.tabs LI.current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; -} - -DIV.navpath -{ - background : none; - border : none; - border-bottom : 1px solid #84B0C7; - text-align : center; - margin : 2px; - padding : 2px; -} - - -/* - NOTE: since v. 1.7.0 Doxygen uses new style names for some tabs... and in particular uses "tabs2" for - the CSS style names of the "Class List, Class Index, Class Hierarchy, Class Members" tabs. - For now we keep for "tabs2" tabs the same style used with other ones. -*/ - - -DIV.tabs2 -{ - float : left; - width : 100%; - background : url("tab_b.gif") repeat-x bottom; - margin-bottom : 4px; -} - -DIV.tabs2 UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; -} - -DIV.tabs2 LI, DIV.tabs2 FORM -{ - display : inline; - margin : 0px; - padding : 0px; -} - -DIV.tabs2 FORM -{ - float : right; -} - -DIV.tabs2 A -{ - float : left; - background : url("tab_r.gif") no-repeat right top; - border-bottom : 1px solid #84B0C7; - font-size : 80%; - font-weight : bold; - text-decoration : none; -} - -DIV.tabs2 A:hover -{ - background-position: 100% -150px; -} - -DIV.tabs2 A:link, DIV.tabs2 A:visited, -DIV.tabs2 A:active, DIV.tabs2 A:hover -{ - color: #1A419D; -} - -DIV.tabs2 SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; -} - -DIV.tabs2 INPUT -{ - float : right; - display : inline; - font-size : 1em; -} - -DIV.tabs2 TD -{ - font-size : 80%; - font-weight : bold; - text-decoration : none; -} - - - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -DIV.tabs2 SPAN {float : none;} -/* End IE5-Mac hack */ - -DIV.tabs2 A:hover SPAN -{ - background-position: 0% -150px; -} - -DIV.tabs2 LI.current A -{ - background-position: 100% -150px; - border-width : 0px; -} - -DIV.tabs2 LI.current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; -} \ No newline at end of file diff --git a/docs/doxygen/wxwidgets.css b/docs/doxygen/wxwidgets.css deleted file mode 100644 index ffb2da9309..0000000000 --- a/docs/doxygen/wxwidgets.css +++ /dev/null @@ -1,494 +0,0 @@ -/***************************************************************************** -** Name: wxwidgets.css -** Purpose: The wxWidgets documentation CSS; a customized version of -** the standard Doxygen CSS -** Author: Doxygen team -** RCS-ID: $Id$ -** Licence: wxWindows licence -*****************************************************************************/ - - -/* - Doxygen classic styles - ====================== -*/ - -BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV { - font-family: Geneva, Arial, Helvetica, sans-serif; -} -BODY,TD { - font-size: 90%; -} -H1 { - text-align: center; - font-size: 160%; - border-top: 1em; -} -H2 { - font-size: 120%; - padding-top: 1em; - border-top: 3px solid #AAA; -} -H3 { - text-align: center; - font-size: 100%; -} -CAPTION { - font-weight: bold -} -DIV.qindex { - width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - padding: 2px; - line-height: 140%; -} -DIV.navpath { - width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - padding: 2px; - line-height: 140%; -} -DIV.navtab { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; -} -TD.navtab { - font-size: 70%; -} -A.qindex { - text-decoration: none; - font-weight: bold; - color: #1A419D; -} -A.qindex:visited { - text-decoration: none; - font-weight: bold; - color: #1A419D -} -A.qindex:hover { - text-decoration: none; - background-color: #ddddff; -} -A.qindexHL { - text-decoration: none; - font-weight: bold; - background-color: #6666cc; - color: #ffffff; - border: 1px double #9295C2; -} -A.qindexHL:hover { - text-decoration: none; - background-color: #6666cc; - color: #ffffff; -} -A.qindexHL:visited { - text-decoration: none; - background-color: #6666cc; - color: #ffffff -} -A.el { - text-decoration: none; - font-weight: bold -} -A.elRef { - font-weight: bold -} -A.code:link { - text-decoration: none; - font-weight: normal; - color: #0000FF -} -A.code:visited { - text-decoration: none; - font-weight: normal; - color: #0000FF -} -A.codeRef:link { - font-weight: normal; - color: #0000FF -} -A.codeRef:visited { - font-weight: normal; - color: #0000FF -} -A:hover { - text-decoration: none; - background-color: #f2f2ff -} -DL.el { - margin-left: -1cm -} -.fragment { - font-family: monospace, fixed; - font-size: 95%; -} -PRE.fragment { - border: 1px solid #CCCCCC; - background-color: #f5f5f5; - margin: 4px 8px 4px 2px; - padding: 4px 6px; -} -DIV.ah { - background-color: black; - font-weight: bold; - color: #ffffff; - margin-bottom: 3px; - margin-top: 3px -} - -DIV.groupHeader { - margin-left: 16px; - margin-top: 12px; - margin-bottom: 6px; - font-weight: bold; -} -DIV.groupText { - margin-left: 16px; - font-style: italic; - font-size: 90% -} -BODY { - background: white; - color: black; - margin-right: 20px; - margin-left: 20px; -} -TD.indexkey { - background-color: #e8eef2; - font-weight: bold; - padding: 2px 10px; - margin: 2px 0px; - border: 1px solid #CCCCCC; -} -TD.indexvalue { - background-color: #e8eef2; - font-style: italic; - padding: 2px 10px; - margin: 2px 0px; - border: 1px solid #CCCCCC; -} -TR.memlist { - background-color: #f0f0f0; -} -P.formulaDsp { - text-align: center; -} -IMG.formulaDsp { -} -IMG.formulaInl { - vertical-align: middle; -} -SPAN.keyword { color: #008000 } -SPAN.keywordtype { color: #604020 } -SPAN.keywordflow { color: #e08000 } -SPAN.comment { color: #800000 } -SPAN.preprocessor { color: #806020 } -SPAN.stringliteral { color: #002080 } -SPAN.charliteral { color: #008080 } -SPAN.vhdldigit { color: #ff00ff } -SPAN.vhdlchar { color: #000000 } -SPAN.vhdlkeyword { color: #700070 } -SPAN.vhdllogic { color: #ff0000 } - -/* Doxygen Member Description Style 1.5.7 */ - -.mdescLeft, .mdescRight, -.memItemLeft, .memItemRight, -.memTemplItemLeft, .memTemplItemRight, .memTemplParams { - background-color: #FAFAFA; - border: none; - margin: 4px; - padding: 1px 0 0 8px; -} - -.mdescLeft, .mdescRight { - padding: 0px 8px 4px 8px; - color: #555; -} - -.memItemLeft, .memItemRight, .memTemplParams { - border-top: 1px solid #ccc; -} - -.memTemplParams { - color: #606060; -} - -/*******************************************/ - -TD.tiny { - font-size: 75%; -} -a { - color: #1A41A8; -} -a:visited { - color: #2A3798; -} -.dirtab { - padding: 4px; - border-collapse: collapse; - border: 1px solid #84b0c7; -} -TH.dirtab { - background: #e8eef2; - font-weight: bold; -} -HR { -/* - height: 3px; - margin-top: 1.5em; - margin-bottom: 1.5em; -*/ - height: 0px; - margin: 0; - border: 0px; -} - -/* Style for detailed member documentation */ - -.memtemplate { - font-size: 80%; - color: #606060; - font-weight: normal; - margin-left: 3px; -} - -.memnav { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; -} - -.memitem { - padding: 0; -} - -.memname { - white-space: nowrap; - font-weight: bold; - padding: 2px 2px; -} - -.memproto, .memdoc { - border: 1px solid #84b0c7; -} - -.memproto { - padding: 0; - background-color: #d5e1e8; - font-weight: bold; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -moz-border-radius-topleft: 8px; - -moz-border-radius-topright: 8px; -} - -.memdoc { - padding: 5px 8px; - background-color: #eef3f5; - border-top-width: 0; - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - -moz-border-radius-bottomleft: 8px; - -moz-border-radius-bottomright: 8px; -} - -.memdoc p, .memdoc dl, .memdoc ul { - margin: 6px 0; -} - -.paramkey { - text-align: right; -} -.paramtype { - white-space: nowrap; -} -.paramname { - color: #602020; - white-space: nowrap; -} -.paramname em { - font-style: normal; -} - -/* End Styling for detailed member documentation */ - -/* for the tree view */ - -.ftvtree { - font-family: sans-serif; - margin:0.5em; -} -.directory { - font-size: 9pt; - font-weight: bold; -} -.directory h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} -.directory > h3 { - margin-top: 0; -} -.directory p { - margin: 0px; - white-space: nowrap; -} -.directory div { - display: none; - margin: 0px; -} -.directory img { - vertical-align: -30%; -} - -/* these are for tree view when not used as main index */ - -.directory-alt { - font-size: 100%; - font-weight: bold; -} - -.directory-alt h3 { - margin: 0px; - margin-top: 1em; - font-size: 11pt; -} - -.directory-alt > h3 { - margin-top: 0; -} - -.directory-alt p { - margin: 0px; - white-space: nowrap; -} - -.directory-alt div { - display: none; - margin: 0px; -} - -.directory-alt img { - vertical-align: -30%; -} - - - -/* - wxWidgets docs specific styles - ============================== -*/ - -H2 > A.anchor { - text-decoration: none; - background-color: none; - color: black; -} - -H3 > A.anchor { - text-decoration: none; - background-color: none; - color: black; -} - -H4 > A.anchor { - text-decoration: none; - background-color: none; - color: black; -} - -IMG { - margin: 20px; -} - -IMG.logo { - float: right; - margin: 20px; -} - -IMG.appearance { - margin: 20px; -} - -.dynheader IMG { - margin: 0px; -} - -TABLE.appearance { - width: 100%; - text-align: center; - font-style: italic; - font-size: 90%; - /*font-weight: bold;*/ -} - -TD.green { color: green; } -TD.orange { color: #ff8000; } -TD.red { color: red; } - -SPAN.literal { - text-decoration: none; - font-weight: bold; - font-family: monospace, fixed; -} - -/* we make all the following tags render the text just like - the standard Doxygen @remarks, @see tags do, to obtain a uniform - look and feel */ -SPAN.itemdef, SPAN.lib, SPAN.category, SPAN.stdobj, SPAN.styles, SPAN.events, SPAN.flags, SPAN.appearance, SPAN.impl, SPAN.avail { - font-weight: bold; - line-height: 130%; -} - -SPAN.style, SPAN.event, SPAN.flag { - font-weight: bold; - color: #880000; -} - -DIV.styleDesc, DIV.eventDesc, DIV.flagDesc { - margin-left: 3%; - margin-bottom: 1ex; -} - -DIV.eventHandler { - margin: 1em; - text-indent: 3%; -} - -DIV.eventHandler SPAN { - padding: 5px; - background-color: #eeeeee; - font-family: monospace, fixed; -} - -/* 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: 100%; - font-weight: normal; -} - -LI { - line-height: 115%; -} - -CODE { - font-size: 110%; - color: #444444; -} diff --git a/docs/doxygen/wxwidgets.js b/docs/doxygen/wxwidgets.js index 980f91959d..714c971dfc 100644 --- a/docs/doxygen/wxwidgets.js +++ b/docs/doxygen/wxwidgets.js @@ -31,55 +31,17 @@ function setCookie(c_name,value,expiredays) ((expiredays==null) ? '' : ';expires='+exdate.toGMTString()); } -// Reimplementation of changeDisplayState -function mychangeDisplayState( e ) -{ - var num=this.id.replace(/[^[0-9]/g,''); - var button=this.firstChild; - var sectionDiv=document.getElementById('dynsection'+num); - if (sectionDiv.style.display=='none'||sectionDiv.style.display==''){ - sectionDiv.style.display='block'; - button.src='open.gif'; - }else{ - sectionDiv.style.display='none'; - button.src='closed.gif'; +$(function() { + + var display = getCookie('sectionDiv.style.display'); + if ( display == '' || display == 'block' ) { + $('div.dynheader').each(function() { toggleVisibility(this); }); + setCookie('sectionDiv.style.display', 'block'); } - setCookie( 'sectionDiv.style.display', sectionDiv.style.display ); + $('div.dynheader').click(function() { + var display = $('#' + $(this).attr('id') + '-content').css('display'); + setCookie('sectionDiv.style.display', display); + }); -} - -window.onload = function myinitDynSections() -{ - var divs=document.getElementsByTagName('div'); - var sectionCounter=1; - for(var i=0;i