From 556b7f0aea69c7a82a2d0b4c844d07732d005288 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 2 Mar 2010 09:52:31 +0100
Subject: Fixed code generation from newer doxygen versions.

Also changed the wx.hrl output order.
Tried to get it to work with both doxygen-1.4.6 and doxygen-1.6.3.
Minor problems still exists with doxygen-1.6.3.
---
 lib/wx/api_gen/wx_doxygen.conf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/wx/api_gen/wx_doxygen.conf')

diff --git a/lib/wx/api_gen/wx_doxygen.conf b/lib/wx/api_gen/wx_doxygen.conf
index 1fc57486e6..c4e01ab36d 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,12 +253,13 @@ PREDEFINED             = \
   wxUSE_CLIPBOARD=1 \
   wxABI_VERSION=20809 \
   __WXGTK24__=1 \
+  __WXGTK20__=1 \
   __WXGTK__=1 \
   WXDLLEXPORT=""
 
 #  WXWIN_COMPATIBILITY_2_6=1 \
                          
-EXPAND_AS_DEFINED      = YES
+EXPAND_AS_DEFINED      = WX_FORWARD_TO_SCROLL_HELPER __WXGTK20__
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references   
@@ -285,9 +288,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
-- 
cgit v1.2.3