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/wxIcon.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/wxIcon.erl')
| -rw-r--r-- | lib/wx/src/gen/wxIcon.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl index c9ec32dffc..9739a403ff 100644 --- a/lib/wx/src/gen/wxIcon.erl +++ b/lib/wx/src/gen/wxIcon.erl @@ -60,7 +60,7 @@ new() -> Loc::wx:wx_object(). new(Filename) - when is_list(Filename) -> + when ?is_chardata(Filename) -> new(Filename, []); new(#wx_ref{type=LocT,ref=LocRef}) -> ?CLASS(LocT,wx), @@ -75,7 +75,7 @@ new(#wx_ref{type=LocT,ref=LocRef}) -> | {'desiredWidth', integer()} | {'desiredHeight', integer()}. new(Filename, Options) - when is_list(Filename),is_list(Options) -> + when ?is_chardata(Filename),is_list(Options) -> Filename_UC = unicode:characters_to_binary([Filename,0]), MOpts = fun({type, Type}, Acc) -> [<<1:32/?UI,Type:32/?UI>>|Acc]; ({desiredWidth, DesiredWidth}, Acc) -> [<<2:32/?UI,DesiredWidth:32/?UI>>|Acc]; |