diff options
author | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
commit | bcb9300382459deea91038f4847ef3fa70137f11 (patch) | |
tree | 954b9fbf642108082684136b32b71b8a8d925103 /lib/observer/src/observer_lib.erl | |
parent | 9153f7a734ddd9ca47b339cb19b8d44ed79ade0f (diff) | |
parent | 15dd52f771314b6eade47314afcd8b3206c694b1 (diff) | |
download | otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.gz otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.bz2 otp-bcb9300382459deea91038f4847ef3fa70137f11.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/observer/src/observer_lib.erl')
-rw-r--r-- | lib/observer/src/observer_lib.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl index 1eaba31a3a..47844c1307 100644 --- a/lib/observer/src/observer_lib.erl +++ b/lib/observer/src/observer_lib.erl @@ -20,7 +20,7 @@ -module(observer_lib). -export([get_wx_parent/1, - display_info_dialog/1, display_yes_no_dialog/1, + display_info_dialog/2, display_yes_no_dialog/1, display_progress_dialog/2, destroy_progress_dialog/0, wait_for_progress/0, report_progress/1, user_term/3, user_term_multiline/3, @@ -105,10 +105,10 @@ setup_timer(Bool, {Timer, Old}) -> timer:cancel(Timer), setup_timer(Bool, {false, Old}). -display_info_dialog(Str) -> - display_info_dialog("",Str). -display_info_dialog(Title,Str) -> - Dlg = wxMessageDialog:new(wx:null(), Str, [{caption,Title}]), +display_info_dialog(Parent,Str) -> + display_info_dialog(Parent,"",Str). +display_info_dialog(Parent,Title,Str) -> + Dlg = wxMessageDialog:new(Parent, Str, [{caption,Title}]), wxMessageDialog:showModal(Dlg), wxMessageDialog:destroy(Dlg), ok. @@ -724,7 +724,7 @@ progress_loop(Title,PD,Caller) -> if is_list(Reason) -> Reason; true -> file:format_error(Reason) end, - display_info_dialog("Crashdump Viewer Error",FailMsg), + display_info_dialog(PD,"Crashdump Viewer Error",FailMsg), Caller ! error, unregister(?progress_handler), unlink(Caller); |