1 files changed, 18 insertions, 4 deletions
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index ecb8e132fe..c86f5ea916 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -19,7 +19,7 @@
 
 -behaviour(wx_object).
 
--export([start/0]).
+-export([start/0, stop/0]).
 -export([create_menus/2, get_attrib/1, get_tracer/0, set_status/1,
 	 create_txt_dialog/4, try_rpc/4, return_to_localnode/2]).
 
@@ -69,6 +69,9 @@ start() ->
 	_Obj -> ok
     end.
 
+stop() ->
+    wx_object:call(observer, stop).
+
 create_menus(Object, Menus) when is_list(Menus) ->
     wx_object:call(Object, {create_menus, Menus}).
 
@@ -109,9 +112,6 @@ setup(#state{frame = Frame} = State) ->
     observer_lib:create_menus(DefMenus, MenuBar, default),
 
     wxFrame:setMenuBar(Frame, MenuBar),
-    StatusBar = wxFrame:createStatusBar(Frame, []),
-    wxFrame:setTitle(Frame, atom_to_list(node())),
-    wxStatusBar:setStatusText(StatusBar, atom_to_list(node())),
 
     %% Setup panels
     Panel = wxPanel:new(Frame, []),
@@ -127,6 +127,11 @@ setup(#state{frame = Frame} = State) ->
     wxSizer:add(MainSizer, Notebook, [{proportion, 1}, {flag, ?wxEXPAND}]),
     wxPanel:setSizer(Panel, MainSizer),
 
+    StatusBar = wxStatusBar:new(Frame),
+    wxFrame:setStatusBar(Frame, StatusBar),
+    wxFrame:setTitle(Frame, atom_to_list(node())),
+    wxStatusBar:setStatusText(StatusBar, atom_to_list(node())),
+
     wxNotebook:connect(Notebook, command_notebook_page_changing),
     wxFrame:connect(Frame, close_window, [{skip, true}]),
     wxMenu:connect(Frame, command_menu_selected),
@@ -331,6 +336,10 @@ handle_call({get_attrib, Attrib}, _From, State) ->
 handle_call(get_tracer, _From, State=#state{trace_panel=TraceP}) ->
     {reply, TraceP, State};
 
+handle_call(stop, _, State = #state{frame = Frame}) ->
+    wxFrame:destroy(Frame),
+    {stop, normal, ok, State};
+
 handle_call(_Msg, _From, State) ->
     {reply, ok, State}.
 
@@ -367,6 +376,10 @@ handle_info({open_link, Pid0}, State = #state{pro_panel=ProcViewer, frame=Frame}
     end,
     {noreply, State};
 
+handle_info({get_debug_info, From}, State = #state{notebook=Notebook, active_tab=Pid}) ->
+    From ! {observer_debug, wx:get_env(), Notebook, Pid},
+    {noreply, State};
+
 handle_info({'EXIT', Pid, _Reason}, State) ->
     io:format("Child (~s) crashed exiting:  ~p ~p~n",
 	      [pid2panel(Pid, State), Pid,_Reason]),
@@ -377,6 +390,7 @@ handle_info(_Info, State) ->
 
 terminate(_Reason, #state{frame = Frame}) ->
     wxFrame:destroy(Frame),
+    wx:destroy(),
     ok.
 
 code_change(_, _, State) ->