aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/api_gen/wx_gen.hrl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-03-30 07:50:13 +0000
committerErlang/OTP <[email protected]>2010-03-30 07:50:13 +0000
commit7ec00dcfdc34a455230054b6bdd37a6c61fd7a45 (patch)
treeafa30d779dcf435e9dc014e4bdd5046a308c823a /lib/wx/api_gen/wx_gen.hrl
parent02bc42d238d302c712f12f50e767857785416397 (diff)
parent3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8 (diff)
downloadotp-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_gen.hrl')
-rw-r--r--lib/wx/api_gen/wx_gen.hrl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/wx/api_gen/wx_gen.hrl b/lib/wx/api_gen/wx_gen.hrl
index b34d399358..17265a2842 100644
--- a/lib/wx/api_gen/wx_gen.hrl
+++ b/lib/wx/api_gen/wx_gen.hrl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
-record(class,
{
@@ -72,7 +72,7 @@
}
).
--record(enum, {skip="", as_atom=false, vals}).
+-record(enum, {from, skip="", as_atom=false, vals}).
-record(const,{name,val,enum,is_const}).
-define(error(What),