diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-21 15:57:57 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-21 15:57:57 +0100 |
| commit | 31172443bfc849b879385d7ee0d2ea8019c32307 (patch) | |
| tree | a66e29fe08d3bccc85a9b1a4cefdbb0f2edfceed /lib/wx/test/wx_basic_SUITE.erl | |
| parent | 744984833cc1a51f51781e3417db7f152eeab4ae (diff) | |
| parent | 51e369a1b90490e69a358d8c8f0bb9bfbf9f511c (diff) | |
| download | otp-31172443bfc849b879385d7ee0d2ea8019c32307.tar.gz otp-31172443bfc849b879385d7ee0d2ea8019c32307.tar.bz2 otp-31172443bfc849b879385d7ee0d2ea8019c32307.zip | |
Merge branch 'dgud/wx/more-fixes/OTP-11444' into maint
* dgud/wx/more-fixes/OTP-11444:
wx: Fix hanging wx calls
Update wx build instsructions for Darwin
wx: Remove compiler option -fomit-frame-pointer on Darwin
wx: Fix crash when garbage collect event handlers (debugger caused seg fault)
wx: Fix LDFLAGS for Mac
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 d55a037599..c5b0927bf3 100644 --- a/lib/wx/test/wx_basic_SUITE.erl +++ b/lib/wx/test/wx_basic_SUITE.erl @@ -324,7 +324,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())), |