Merge branch 'dgud/remove-gs-apps/OTP-10915'

1 files changed, 14 insertions, 24 deletions

diff --git a/lib/debugger/src/debugger.erl b/lib/debugger/src/debugger.erl
index b97091ee6b..8a2ac28df5 100644
--- a/lib/debugger/src/debugger.erl
+++ b/lib/debugger/src/debugger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -32,44 +32,44 @@
 %% --------
 %% Interface module.
 %%
-%% dbg_ui_winman
+%% dbg_wx_winman
 %% -------------
 %% Window manager, keeping track of open windows and Debugger
 %% processes.
 %%
-%% dbg_ui_mon, dbg_ui_mon_win
+%% dbg_wx_mon, dbg_wx_mon_win
 %% --------------------------
 %% Monitor window, main window of Debugger, displaying information
 %% about interpreted modules and debugged processes.
 %%
-%% dbg_ui_trace, dbg_ui_trace_win
+%% dbg_wx_trace, dbg_wx_trace_win
 %% ------------------------------
 %% Attach process window, showing the code executed by a debugged
 %% process and providing a GUI for stepping, inspecting variables etc.
 %%
-%% dbg_ui_break, dbg_ui_break_win
+%% dbg_wx_break, dbg_wx_break_win
 %% ------------------------------
 %% Help window for creating new breakpoints.
 %%
-%% dbg_ui_edit, dbg_ui_edit_win
+%% dbg_wx_edit, dbg_wx_edit_win
 %% --------------------------------------
 %% Help window for editing terms, used for setting backtrace size
 %% (i.e. how many stack frames to display in the attach process window)
 %% and changing variable values.
 %%
-%% dbg_ui_interpret, dbg_ui_filedialog_win
+%% dbg_wx_interpret, dbg_wx_filedialog_win
 %% --------------------------------------
 %% Help window for selecting modules to interpret.
 %%
-%% dbg_ui_settings, dbg_ui_filedialog_win
+%% dbg_wx_settings, dbg_wx_filedialog_win
 %% --------------------------------------
 %% Help window for saving and loading Debugger settings.
 %%
-%% dbg_ui_view
+%% dbg_wx_view
 %% -----------
-%% Help window for viewing interpreted modules (uses dbg_ui_trace_win).
+%% Help window for viewing interpreted modules (uses dbg_wx_trace_win).
 %%
-%% dbg_ui_win
+%% dbg_wx_win
 %% ----------
 %% GUI specific functionality used by more than one window type.
 %%
@@ -78,7 +78,7 @@ start() ->
     start(global, default, default).
 start(Mode) when Mode==local; Mode==global ->
     start(Mode, default, default);
-start(Gui) when Gui==gs; Gui==wx ->
+start(Gui) when Gui==wx ->
     start(global, default, Gui);
 start(SFile) when is_list(SFile), is_integer(hd(SFile)) ->
     start(global, SFile, default).
@@ -86,8 +86,6 @@ start(SFile) when is_list(SFile), is_integer(hd(SFile)) ->
 start(Mode, SFile) ->
     start(Mode, SFile, default).
 
-start(Mode, SFile, gs) ->
-    dbg_ui_mon:start(Mode, SFile);
 start(Mode, SFile, wx) ->
     dbg_wx_mon:start(Mode, SFile);
 start(Mode, SFile, default) ->
@@ -95,7 +93,7 @@ start(Mode, SFile, default) ->
     start(Mode, SFile, Gui).
 
 stop() ->
-    dbg_ui_mon:stop().
+    dbg_wx_mon:stop().
 
 quick(M, F, A) ->
     int:i(M),
@@ -104,15 +102,7 @@ quick(M, F, A) ->
 
 auto_attach(Flags) ->    
     case which_gui() of
-	gs -> int:auto_attach(Flags, {dbg_ui_trace, start, []});
 	wx -> int:auto_attach(Flags, {dbg_wx_trace, start, []})
     end.
 
-which_gui() ->
-    try
-	wx:new(),
-	wx:destroy(),
-	wx
-    catch _:_ ->
-	    gs
-    end.
+which_gui() -> wx.