diff options
| author | Erlang/OTP <[email protected]> | 2010-03-30 07:50:13 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-30 07:50:13 +0000 |
| commit | 7ec00dcfdc34a455230054b6bdd37a6c61fd7a45 (patch) | |
| tree | afa30d779dcf435e9dc014e4bdd5046a308c823a /lib/wx/api_gen/wx_doxygen.conf | |
| parent | 02bc42d238d302c712f12f50e767857785416397 (diff) | |
| parent | 3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8 (diff) | |
| download | otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.tar.gz otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.tar.bz2 otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.zip | |
Merge branch 'dgud/wx-new-doxygen' into dev
* dgud/wx-new-doxygen:
Added a non existing macro on windows.
Commit of the generated code with previous commit.
Fixed code generation from newer doxygen versions.
Whitespace fixes
OTP-8547 dgud/wx-new-doxygen
Diffstat (limited to 'lib/wx/api_gen/wx_doxygen.conf')
| -rw-r--r-- | lib/wx/api_gen/wx_doxygen.conf | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/wx/api_gen/wx_doxygen.conf b/lib/wx/api_gen/wx_doxygen.conf index 1fc57486e6..df150fd154 100644 --- a/lib/wx/api_gen/wx_doxygen.conf +++ b/lib/wx/api_gen/wx_doxygen.conf @@ -8,7 +8,7 @@ PROJECT_NUMBER = 0.1 OUTPUT_DIRECTORY = ./ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO +#USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = @@ -20,7 +20,7 @@ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO +# DETAILS_AT_TOP = NO INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO SEPARATE_MEMBER_PAGES = NO @@ -73,11 +73,11 @@ WARN_LOGFILE = # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = @WXGTK_DIR@/wx/ wx_extra/ -#FILE_PATTERNS = *.h +# FILE_PATTERNS = *.h RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = mac/* mgl/* msw/* os2/* x11/* gtk1/* cocoa/* motif/* msdos/* palmos/* private/* +EXCLUDE_PATTERNS = mac/* mgl/* msw/* os2/* x11/* gtk1/* cocoa/* motif/* msdos/* palmos/* private/* vms_x_fix.h EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO @@ -176,10 +176,11 @@ PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO +EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = + PREDEFINED = \ wxUSE_MENUS=1 \ wxUSE_TOOLBAR=1 \ @@ -215,6 +216,7 @@ PREDEFINED = \ wxUSE_LISTBOX=1 \ wxUSE_BMPBUTTON=1 \ wxUSE_CHECKBOX=1 \ + wxUSE_CHECKLISTBOX=1 \ wxUSE_TREECTRL=1 \ wxUSE_LISTCTRL=1 \ wxUSE_BOOKCTRL=1 \ @@ -251,15 +253,17 @@ PREDEFINED = \ wxUSE_CLIPBOARD=1 \ wxABI_VERSION=20809 \ __WXGTK24__=1 \ + __WXGTK20__=1 \ __WXGTK__=1 \ + wxCHECKLBOX_CHECKED="" \ WXDLLEXPORT="" # WXWIN_COMPATIBILITY_2_6=1 \ - -EXPAND_AS_DEFINED = YES + +EXPAND_AS_DEFINED = WX_FORWARD_TO_SCROLL_HELPER SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = @@ -285,9 +289,6 @@ DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES |