diff options
| author | Dan Gudmundsson <[email protected]> | 2013-12-20 10:44:42 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-12-20 10:44:42 +0100 |
| commit | 6f0b3bd3fc28de703490470630922873775c97f5 (patch) | |
| tree | 520b662b4459499e8c58b658285368d81334d326 /lib/et/src/et_viewer.erl | |
| parent | 0b68c48630311c5c97db50159c3076fa5b17a43d (diff) | |
| parent | 560f73141afbc1ef41d6c8acb3974b3632ad6f25 (diff) | |
| download | otp-6f0b3bd3fc28de703490470630922873775c97f5.tar.gz otp-6f0b3bd3fc28de703490470630922873775c97f5.tar.bz2 otp-6f0b3bd3fc28de703490470630922873775c97f5.zip | |
Merge branch 'dgud/remove-gs-apps/OTP-10915'
Diffstat (limited to 'lib/et/src/et_viewer.erl')
| -rw-r--r-- | lib/et/src/et_viewer.erl | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lib/et/src/et_viewer.erl b/lib/et/src/et_viewer.erl index d9bd01f8d0..ead5639da6 100644 --- a/lib/et/src/et_viewer.erl +++ b/lib/et/src/et_viewer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2010. All Rights Reserved. +%% Copyright Ericsson AB 2000-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -76,7 +76,7 @@ start() -> %% start(Options) -> {ok, ViewerPid} | {error, Reason} %%---------------------------------------------------------------------- -start(GUI) when GUI =:= wx; GUI =:= gs; GUI =:= default -> +start(GUI) when GUI =:= wx; GUI =:= default -> start_link([{trace_global, true}], GUI); start(Options) -> start_link([{parent_pid, undefined} | Options], default). @@ -139,7 +139,7 @@ start(Options, GUI) -> %% and returns false | true | {true, NewEvent}. %%---------------------------------------------------------------------- -start_link(GUI) when GUI =:= wx; GUI =:= gs; GUI =:= default -> +start_link(GUI) when GUI =:= wx; GUI =:= default -> start_link([{trace_global, true}], GUI); start_link(Options) -> start_link(Options, default). @@ -148,22 +148,11 @@ start_link(Options, GUI) -> case GUI of wx -> et_wx_viewer:start_link(Options); - gs -> - et_gs_viewer:start_link(Options); default -> start_link(Options, which_gui()) end. - -which_gui() -> - try - wx:new(), - wx:destroy(), - wx - catch _:_ -> - gs - end. - +which_gui() -> wx. get_collector_pid(ViewerPid) -> call(ViewerPid, get_collector_pid). |