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/wxFont.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/wxFont.erl')
| -rw-r--r-- | lib/wx/src/gen/wxFont.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxFont.erl b/lib/wx/src/gen/wxFont.erl index 56e6e96b6d..fb0ba8b505 100644 --- a/lib/wx/src/gen/wxFont.erl +++ b/lib/wx/src/gen/wxFont.erl @@ -49,7 +49,7 @@ new() -> -spec new(Fontname) -> wxFont() when Fontname::unicode:chardata(). new(Fontname) - when is_list(Fontname) -> + when ?is_chardata(Fontname) -> Fontname_UC = unicode:characters_to_binary([Fontname,0]), wxe_util:construct(?wxFont_new_1, <<(byte_size(Fontname_UC)):32/?UI,(Fontname_UC)/binary, 0:(((8- ((4+byte_size(Fontname_UC)) band 16#7)) band 16#7))/unit:8>>). @@ -183,7 +183,7 @@ setDefaultEncoding(Encoding) -spec setFaceName(This, FaceName) -> boolean() when This::wxFont(), FaceName::unicode:chardata(). setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName) - when is_list(FaceName) -> + when ?is_chardata(FaceName) -> ?CLASS(ThisT,wxFont), FaceName_UC = unicode:characters_to_binary([FaceName,0]), wxe_util:call(?wxFont_SetFaceName, |