diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-07 10:04:56 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-07 10:04:56 +0200 |
| commit | 672c14dc0ed9e681856932c58b26d08f3d449e71 (patch) | |
| tree | 1750c85999e0bf7946d7d3b49e18d441f356f8ec /lib/wx/src/gen/wxButton.erl | |
| parent | e9bb2e8797931efefac711d1b6d0de9571024c4d (diff) | |
| parent | 668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47 (diff) | |
| download | otp-672c14dc0ed9e681856932c58b26d08f3d449e71.tar.gz otp-672c14dc0ed9e681856932c58b26d08f3d449e71.tar.bz2 otp-672c14dc0ed9e681856932c58b26d08f3d449e71.zip | |
Merge branch 'maint'
* maint:
New file erlang-edoc.el to support EDoc in erlang-mode
Allow reusing mnesia select continuations
Fix guard test for chardata
Diffstat (limited to 'lib/wx/src/gen/wxButton.erl')
| -rw-r--r-- | lib/wx/src/gen/wxButton.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl index c6686cdf10..f16e1a376e 100644 --- a/lib/wx/src/gen/wxButton.erl +++ b/lib/wx/src/gen/wxButton.erl @@ -163,7 +163,7 @@ setDefault(#wx_ref{type=ThisT,ref=ThisRef}) -> -spec setLabel(This, Label) -> 'ok' when This::wxButton(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) - when is_list(Label) -> + when ?is_chardata(Label) -> ?CLASS(ThisT,wxButton), Label_UC = unicode:characters_to_binary([Label,0]), wxe_util:cast(?wxButton_SetLabel, |