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/wxColourPickerCtrl.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/wxColourPickerCtrl.erl')
| -rw-r--r-- | lib/wx/src/gen/wxColourPickerCtrl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl index 8ec710d5e3..2fe55018dc 100644 --- a/lib/wx/src/gen/wxColourPickerCtrl.erl +++ b/lib/wx/src/gen/wxColourPickerCtrl.erl @@ -169,7 +169,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> (This, Col) -> 'ok' when This::wxColourPickerCtrl(), Col::wx:wx_colour(). setColour(#wx_ref{type=ThisT,ref=ThisRef},Text) - when is_list(Text) -> + when ?is_chardata(Text) -> ?CLASS(ThisT,wxColourPickerCtrl), Text_UC = unicode:characters_to_binary([Text,0]), wxe_util:call(?wxColourPickerCtrl_SetColour_1_0, |