diff options
author | Dan Gudmundsson <[email protected]> | 2016-10-07 09:58:20 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-10-07 09:58:20 +0200 |
commit | 668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47 (patch) | |
tree | 91e7d3a029125acb10167c9462922f0afc89c855 /lib/wx/src/gen/wxButton.erl | |
parent | 2110e59e971af2f114eba36b04f36dc6b25a443d (diff) | |
parent | 097cc3f6679a7c3769111cdb15a630186218d015 (diff) | |
download | otp-668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47.tar.gz otp-668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47.tar.bz2 otp-668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47.zip |
Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maint
* dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934:
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, |