diff options
author | Dan Gudmundsson <[email protected]> | 2014-01-21 16:01:33 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2014-01-21 16:01:33 +0100 |
commit | f836096cb383c6a3c5c91956ded5bd4e2772bcd2 (patch) | |
tree | 293fd589d9bab7505ef7d4a6cb2dbb82c69b01e7 /lib/wx/test/wx_basic_SUITE.erl | |
parent | df47401bc897afc1b3929fc32426fcb0d0c00d0a (diff) | |
parent | 31172443bfc849b879385d7ee0d2ea8019c32307 (diff) | |
download | otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.tar.gz otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.tar.bz2 otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/test/wx_basic_SUITE.erl')
-rw-r--r-- | lib/wx/test/wx_basic_SUITE.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl index df92348b3d..9174b80d52 100644 --- a/lib/wx/test/wx_basic_SUITE.erl +++ b/lib/wx/test/wx_basic_SUITE.erl @@ -323,7 +323,18 @@ data_types(_Config) -> wx_object(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo); wx_object(Config) -> wx:new(), - Frame = ?mt(wxFrame, wx_obj_test:start([])), + Me = self(), + Init = fun() -> + Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]), + Sz = wxBoxSizer:new(?wxHORIZONTAL), + Panel = wxPanel:new(Frame), + wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]), + wxPanel:connect(Panel, size, [{skip, true}]), + wxPanel:connect(Panel, paint, [callback, {userData, Me}]), + wxWindow:show(Frame), + {Frame, {Frame, Panel}} + end, + Frame = ?mt(wxFrame, wx_obj_test:start([{init, Init}])), timer:sleep(500), ?m(ok, check_events(flush())), |