aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxListbook.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-10-07 09:58:20 +0200
committerDan Gudmundsson <[email protected]>2016-10-07 09:58:20 +0200
commit668e0ae7e0e06edc03eb188f1cb6b223ec8c8d47 (patch)
tree91e7d3a029125acb10167c9462922f0afc89c855 /lib/wx/src/gen/wxListbook.erl
parent2110e59e971af2f114eba36b04f36dc6b25a443d (diff)
parent097cc3f6679a7c3769111cdb15a630186218d015 (diff)
downloadotp-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/wxListbook.erl')
-rw-r--r--lib/wx/src/gen/wxListbook.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl
index f49360cb1d..d27efb2500 100644
--- a/lib/wx/src/gen/wxListbook.erl
+++ b/lib/wx/src/gen/wxListbook.erl
@@ -120,7 +120,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
This::wxListbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata().
addPage(This,Page,Text)
- when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
+ when is_record(This, wx_ref),is_record(Page, wx_ref),?is_chardata(Text) ->
addPage(This,Page,Text, []).
%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookaddpage">external documentation</a>.
@@ -129,7 +129,7 @@ addPage(This,Page,Text)
Option :: {'bSelect', boolean()}
| {'imageId', integer()}.
addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options)
- when is_list(Text),is_list(Options) ->
+ when ?is_chardata(Text),is_list(Options) ->
?CLASS(ThisT,wxListbook),
?CLASS(PageT,wxWindow),
Text_UC = unicode:characters_to_binary([Text,0]),
@@ -296,7 +296,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata().
insertPage(This,N,Page,Text)
- when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
+ when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),?is_chardata(Text) ->
insertPage(This,N,Page,Text, []).
%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookinsertpage">external documentation</a>.
@@ -305,7 +305,7 @@ insertPage(This,N,Page,Text)
Option :: {'bSelect', boolean()}
| {'imageId', integer()}.
insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options)
- when is_integer(N),is_list(Text),is_list(Options) ->
+ when is_integer(N),?is_chardata(Text),is_list(Options) ->
?CLASS(ThisT,wxListbook),
?CLASS(PageT,wxWindow),
Text_UC = unicode:characters_to_binary([Text,0]),
@@ -347,7 +347,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
-spec setPageText(This, N, StrText) -> boolean() when
This::wxListbook(), N::integer(), StrText::unicode:chardata().
setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
- when is_integer(N),is_list(StrText) ->
+ when is_integer(N),?is_chardata(StrText) ->
?CLASS(ThisT,wxListbook),
StrText_UC = unicode:characters_to_binary([StrText,0]),
wxe_util:call(?wxListbook_SetPageText,