diff options
| author | Dan Gudmundsson <[email protected]> | 2016-05-09 10:20:06 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-05-09 10:20:06 +0200 |
| commit | 4de491e9c563c49b5d5c88756c5ba00eb0dff66c (patch) | |
| tree | 95fabe050ce3ccb6022845a85b2342b05985e2e0 /lib/wx/test/wx_class_SUITE.erl | |
| parent | b3a7924f657828585bdc517e4c8a03785478e584 (diff) | |
| parent | a563c17bdea478952b619984571207c63862c7f8 (diff) | |
| download | otp-4de491e9c563c49b5d5c88756c5ba00eb0dff66c.tar.gz otp-4de491e9c563c49b5d5c88756c5ba00eb0dff66c.tar.bz2 otp-4de491e9c563c49b5d5c88756c5ba00eb0dff66c.zip | |
Merge branch 'dgud/wx/compatible-with-wxW-3.1'
* dgud/wx/compatible-with-wxW-3.1:
Test cuddle, increase sleep
wx: Fix warnings in example
Fix argv types
wx: Remove non implemented wxGauge functions
Diffstat (limited to 'lib/wx/test/wx_class_SUITE.erl')
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index f88c10f987..6944a78360 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -643,8 +643,11 @@ modal(Config) -> wx:set_env(Env), modal_dialog(Frame, 1, Tester) end), - receive {dialog, M1, 1} -> timer:sleep(200), ets:insert(test_state, {M1, ready}) end, - receive {dialog, M2, 2} -> timer:sleep(200), ets:insert(test_state, {M2, ready}) end, + %% need to sleep so we know that the window is stuck in + %% the ShowModal event loop and not in an earlier event loop + %% wx2.8 invokes the event loop from more calls than wx-3 + receive {dialog, M1, 1} -> timer:sleep(1200), ets:insert(test_state, {M1, ready}) end, + receive {dialog, M2, 2} -> timer:sleep(1200), ets:insert(test_state, {M2, ready}) end, receive done -> ok end, receive {dialog_done, M2, 2} -> M2 end, |