diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2020-02-17 14:29:52 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2020-02-17 14:29:52 +0100 |
| commit | 02f5d65c19ab988dbd3fc3d5b73015c0321fec35 (patch) | |
| tree | 388bbcfc63e38ee36a93d83d39173e3e498b58bb /lib | |
| parent | 55e72c8d188cea8c3b415ba84797d0603be478c6 (diff) | |
| download | erlang-02f5d65c19ab988dbd3fc3d5b73015c0321fec35.tar.gz | |
Update code-gen to gen correct deprecated functions
The generated code and not the generator was updated in a previous commit.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wx/api_gen/wx_gen_erl.erl | 8 | ||||
| -rw-r--r-- | lib/wx/src/gen/wxCalendarCtrl.erl | 6 | ||||
| -rw-r--r-- | lib/wx/src/gen/wxDC.erl | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl index 797533309b..d029ae77cb 100644 --- a/lib/wx/api_gen/wx_gen_erl.erl +++ b/lib/wx/api_gen/wx_gen_erl.erl @@ -159,7 +159,13 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) -> w("-export_type([~s/0]).~n", [Name]), case lists:filter(fun({_F,Depr}) -> Depr end, ExportList) of [] -> ok; - Depr -> w("-deprecated([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", Depr, 60)]) + Depr -> + DepStr = "not available in wxWidgets-2.9 and later", + w("-deprecated([~s]).~n~n", + [args(fun({EF,_}) -> + [DFun,DArgs] = string:split(EF, "/"), + io_lib:format("{~s,~s,\"~s\"}", [DFun,DArgs,DepStr]) + end, ",\n ", Depr, 60)]) end, case lists:filter(fun({_,_,Depr}) -> Depr end, InExported) of [] -> ok; diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl index e11cc5a6ba..221de7bf69 100644 --- a/lib/wx/src/gen/wxCalendarCtrl.erl +++ b/lib/wx/src/gen/wxCalendarCtrl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2019. All Rights Reserved. +%% Copyright Ericsson AB 2008-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -78,8 +78,8 @@ update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). -export_type([wxCalendarCtrl/0]). --deprecated([{enableYearChange,'_', - "not available in wxWidgets-2.9 and later"}]). +-deprecated([{enableYearChange,1,"not available in wxWidgets-2.9 and later"}, + {enableYearChange,2,"not available in wxWidgets-2.9 and later"}]). %% @hidden parent_class(wxControl) -> true; diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl index 6acb868c73..322f80e4f0 100644 --- a/lib/wx/src/gen/wxDC.erl +++ b/lib/wx/src/gen/wxDC.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2016. All Rights Reserved. +%% Copyright Ericsson AB 2008-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -51,8 +51,7 @@ -export([parent_class/1]). -export_type([wxDC/0]). --deprecated([{computeScaleAndOrigin,1, - "not available in wxWidgets-2.9 and later"}]). +-deprecated([{computeScaleAndOrigin,1,"not available in wxWidgets-2.9 and later"}]). %% @hidden parent_class(_Class) -> erlang:error({badtype, ?MODULE}). |