diff options
author | Dan Gudmundsson <[email protected]> | 2011-11-18 08:55:33 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2011-11-18 08:56:54 +0100 |
commit | 1d4c9de4304de621a41dcbe5eef866d449b03a12 (patch) | |
tree | 071f151cd2e32e33580b2c15128e3dbbdd2ed7ae /lib/wx/api_gen/wx_doxygen.conf | |
parent | 1a2d7fd6f8fd88f2dad49152fb10f30b952709ce (diff) | |
parent | 5cd8a13c24cbb9e3c514807b56460bb90a777235 (diff) | |
download | otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.gz otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.bz2 otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.zip |
Merge branch 'dgud/wx/system_opts/OTP-9702'
* dgud/wx/system_opts/OTP-9702:
[wx] Change libGL loading
[wx] Fix deadlock in callback handling
[wx] Add wxSystemOptions
[wx] Fix whitespaces
OTP-9725
Diffstat (limited to 'lib/wx/api_gen/wx_doxygen.conf')
-rw-r--r-- | lib/wx/api_gen/wx_doxygen.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/wx/api_gen/wx_doxygen.conf b/lib/wx/api_gen/wx_doxygen.conf index df150fd154..829702cbbf 100644 --- a/lib/wx/api_gen/wx_doxygen.conf +++ b/lib/wx/api_gen/wx_doxygen.conf @@ -251,6 +251,7 @@ PREDEFINED = \ wxUSE_DATAOBJ=1 \ wxUSE_SLIDER=1 \ wxUSE_CLIPBOARD=1 \ + wxUSE_SYSTEM_OPTIONS=1 \ wxABI_VERSION=20809 \ __WXGTK24__=1 \ __WXGTK20__=1 \ |