Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 39 insertions, 38 deletions

diff --git a/lib/wx/src/gen/wxCaret.erl b/lib/wx/src/gen/wxCaret.erl
index 57db5906f3..8833a920d5 100644
--- a/lib/wx/src/gen/wxCaret.erl
+++ b/lib/wx/src/gen/wxCaret.erl
@@ -1,23 +1,24 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2016. 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/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% 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.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html">wxCaret</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html">wxCaret</a>.
 %% @type wxCaret().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,7 +37,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCaret() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
 -spec new(Window, Size) -> wxCaret() when
 	Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 new(#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
@@ -45,7 +46,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
   wxe_util:construct(?wxCaret_new_2,
   <<WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
 -spec new(Window, Width, Height) -> wxCaret() when
 	Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 new(#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
@@ -54,7 +55,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
   wxe_util:construct(?wxCaret_new_3,
   <<WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
 -spec create(This, Window, Size) -> boolean() when
 	This::wxCaret(), Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
@@ -64,7 +65,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{Size
   wxe_util:call(?wxCaret_Create_2,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
 -spec create(This, Window, Width, Height) -> boolean() when
 	This::wxCaret(), Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
@@ -74,13 +75,13 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width
   wxe_util:call(?wxCaret_Create_3,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetblinktime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetblinktime">external documentation</a>.
 -spec getBlinkTime() -> integer().
 getBlinkTime() ->
   wxe_util:call(?wxCaret_GetBlinkTime,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxCaret().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -88,7 +89,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxCaret().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -96,7 +97,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxCaret().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -104,15 +105,15 @@ getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcarethide">external documentation</a>.
--spec hide(This) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcarethide">external documentation</a>.
+-spec hide(This) -> 'ok' when
 	This::wxCaret().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   ?CLASS(ThisT,wxCaret),
   wxe_util:cast(?wxCaret_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxCaret().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +121,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretisvisible">external documentation</a>.
 -spec isVisible(This) -> boolean() when
 	This::wxCaret().
 isVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -128,8 +129,8 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_IsVisible,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
--spec move(This, Pt) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+-spec move(This, Pt) -> 'ok' when
 	This::wxCaret(), Pt::{X::integer(), Y::integer()}.
 move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
  when is_integer(PtX),is_integer(PtY) ->
@@ -137,8 +138,8 @@ move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxCaret_Move_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
--spec move(This, X, Y) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+-spec move(This, X, Y) -> 'ok' when
 	This::wxCaret(), X::integer(), Y::integer().
 move(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
  when is_integer(X),is_integer(Y) ->
@@ -146,16 +147,16 @@ move(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxCaret_Move_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetblinktime">external documentation</a>.
--spec setBlinkTime(Milliseconds) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetblinktime">external documentation</a>.
+-spec setBlinkTime(Milliseconds) -> 'ok' when
 	Milliseconds::integer().
 setBlinkTime(Milliseconds)
  when is_integer(Milliseconds) ->
   wxe_util:cast(?wxCaret_SetBlinkTime,
   <<Milliseconds:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
--spec setSize(This, Size) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+-spec setSize(This, Size) -> 'ok' when
 	This::wxCaret(), Size::{W::integer(), H::integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->
@@ -163,8 +164,8 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxCaret_SetSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
--spec setSize(This, Width, Height) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+-spec setSize(This, Width, Height) -> 'ok' when
 	This::wxCaret(), Width::integer(), Height::integer().
 setSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
  when is_integer(Width),is_integer(Height) ->
@@ -173,17 +174,17 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
 %% @equiv show(This, [])
--spec show(This) -> ok when
+-spec show(This) -> 'ok' when
 	This::wxCaret().
 
 show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretshow">external documentation</a>.
--spec show(This, [Option]) -> ok when
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretshow">external documentation</a>.
+-spec show(This, [Option]) -> 'ok' when
 	This::wxCaret(),
-	Option :: {show, boolean()}.
+	Option :: {'show', boolean()}.
 show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
  when is_list(Options) ->
   ?CLASS(ThisT,wxCaret),
@@ -194,7 +195,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
 %% @doc Destroys this object, do not use object again
--spec destroy(This::wxCaret()) -> ok.
+-spec destroy(This::wxCaret()) -> 'ok'.
 destroy(Obj=#wx_ref{type=Type}) ->
   ?CLASS(Type,wxCaret),
   wxe_util:destroy(?wxCaret_destruct,Obj),