diff options
| author | Dan Gudmundsson <[email protected]> | 2015-01-13 12:58:58 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-01-13 12:58:58 +0100 |
| commit | df7e1bab57862b4d7c37da4771790a4462c3eca5 (patch) | |
| tree | 95924f0c30c64263dda1cc38827c4c0295df77a1 /lib/wx/test | |
| parent | 8ee2d5f59f0e3ceee6895b5af41e563a29a22be2 (diff) | |
| parent | 8956d9d02190cac3a82b89eb23b68b3494ed390f (diff) | |
| download | otp-df7e1bab57862b4d7c37da4771790a4462c3eca5.tar.gz otp-df7e1bab57862b4d7c37da4771790a4462c3eca5.tar.bz2 otp-df7e1bab57862b4d7c37da4771790a4462c3eca5.zip | |
Merge branch 'maint'
* maint:
debugger: Fix debugger save options on mac
wx: Do not crash server when going down
Diffstat (limited to 'lib/wx/test')
| -rw-r--r-- | lib/wx/test/wx_event_SUITE.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl index 2c6c59bb55..3252547c9b 100644 --- a/lib/wx/test/wx_event_SUITE.erl +++ b/lib/wx/test/wx_event_SUITE.erl @@ -336,12 +336,14 @@ connect_in_callback(Config) -> end}]), wxWindow:show(F1), receive - {continue, F1} -> Tester ! {continue, F1} + {continue, F1} -> + true = wxFrame:disconnect(F1, size), + Tester ! {continue, F1} end end, - wxFrame:connect(Frame,size, + wxFrame:connect(Frame,show, [{callback, - fun(#wx{event=#wxSize{}},_SizeEv) -> + fun(#wx{event=#wxShow{}},_SizeEv) -> io:format("Frame got size~n",[]), spawn(TestWindow) end}]), |