dbg_wx* - fix remaining unmached_return warnings

7 files changed, 27 insertions, 23 deletions

diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index ad9217d07d..57a3719a50 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -171,10 +171,10 @@ handle_cmd(Bs, Status, Ieval) ->
 %% User control of process execution and settings
 %%====================================================================
 
-step(Meta) ->     Meta ! {user, {cmd, step}}.
-next(Meta) ->     Meta ! {user, {cmd, next}}.
+step(Meta) ->     Meta ! {user, {cmd, step}}, ok.
+next(Meta) ->     Meta ! {user, {cmd, next}}, ok.
 continue(Meta) -> Meta ! {user, {cmd, continue}}, ok.
-finish(Meta) ->   Meta ! {user, {cmd, finish}}.
+finish(Meta) ->   Meta ! {user, {cmd, finish}}, ok.
 skip(Meta) ->     Meta ! {user, {cmd, skip}}.
 
 timeout(Meta) ->  Meta ! {user, timeout}.
diff --git a/lib/debugger/src/dbg_wx_code.erl b/lib/debugger/src/dbg_wx_code.erl
index f8fc331a81..473963500a 100644
--- a/lib/debugger/src/dbg_wx_code.erl
+++ b/lib/debugger/src/dbg_wx_code.erl
@@ -127,20 +127,22 @@ load_code(Ed, Code) ->
     %%io:format("~p ~p ~p~n", [Lines, Sz, LW]),
     ?stc:setMarginWidth(Ed, 0, LW+5),
     ?stc:setReadOnly(Ed, true),
-    Ed.
+    ok.
 
 unload_code(Ed) ->
     ?stc:setReadOnly(Ed, false),
     ?stc:setTextRaw(Ed, <<0:8>>),
     ?stc:setReadOnly(Ed, true),
-    Ed.
+    ok.
 
 add_break_to_code(Ed, Line, active) ->
     ?stc:markerDelete(Ed, Line-1, 1),
-    ?stc:markerAdd(Ed, Line-1, 0);
+    ?stc:markerAdd(Ed, Line-1, 0),
+    ok;
 add_break_to_code(Ed, Line, inactive) ->
     ?stc:markerDelete(Ed, Line-1, 0),
-    ?stc:markerAdd(Ed, Line-1, 1).
+    ?stc:markerAdd(Ed, Line-1, 1),
+    ok.
 
 del_break_from_code(Ed,Line) ->
     ?stc:markerDelete(Ed, Line-1, 0),
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 345367a911..a32a6894b8 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -135,7 +135,7 @@ init2(CallingPid, Mode, SFile, GS) ->
 
     %% Start other necessary stuff
     dbg_wx_win:init(),     
-    dbg_wx_winman:start(), % Debugger window manager
+    _ = dbg_wx_winman:start(), % Debugger window manager
 
     %% Create monitor window
     Title = "Monitor",
@@ -339,7 +339,7 @@ gui_cmd('Delete All Modules', State) ->
     lists:foreach(fun(Mod) -> int:nn(Mod) end, int:interpreted()),
     State;
 gui_cmd({module, Mod, What}, State) ->
-    case What of
+    _ = case What of
 	delete -> int:nn(Mod);
 	view -> 
 	    Window = dbg_wx_mon_win:get_window(State#state.win),
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index f9c60f9b72..6af19af33b 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -321,7 +321,7 @@ gui_cmd('Kill', State) ->
     exit(State#state.pid, kill),
     State;
 gui_cmd('Messages', State) ->
-    case int:meta(State#state.meta, messages) of
+    _ = case int:meta(State#state.meta, messages) of
 	[] ->
 	    dbg_wx_trace_win:eval_output(State#state.win,"< No Messages!\n", bold);
 	Messages ->
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl
index 2e657ac1d3..972a917728 100644
--- a/lib/debugger/src/dbg_wx_trace_win.erl
+++ b/lib/debugger/src/dbg_wx_trace_win.erl
@@ -123,7 +123,8 @@
 %%   GS = term()
 %%--------------------------------------------------------------------
 init() ->
-    dbg_wx_win:init().
+    _ = dbg_wx_win:init(),
+    ok.
 
 stop(#winInfo{window=Win}) ->
     (catch wxFrame:destroy(Win)),
@@ -230,7 +231,7 @@ get_window(WinInfo) ->
 %%--------------------------------------------------------------------
 configure(Wi=#winInfo{window=Win,m_szr={Panel,Sizer}}) ->
     wx:batch(fun() ->
-		     show_windows(Wi),
+		     _ = show_windows(Wi),
 		     wxSizer:layout(Sizer),
 		     %%wxWindow:setSizerAndFit(Panel,Sizer),
 		     wxWindow:setSizer(Panel, Sizer),
@@ -242,7 +243,7 @@ configure(Wi=#winInfo{window=Win,m_szr={Panel,Sizer}}) ->
 configure(Wi0=#winInfo{window=Win,m_szr={Panel,Sizer}}, Windows) ->
     wx:batch(fun() -> 
 		     Wi = enable_windows(Wi0, Windows),
-		     show_windows(Wi),
+		     _ = show_windows(Wi),
 		     wxSizer:layout(Sizer),
 		     wxWindow:setSizer(Panel, Sizer),
 		     _ = wxSizer:fit(Sizer, Win),
@@ -348,7 +349,7 @@ add_break(WinInfo, Menu, {{Mod,Line},[Status|_Options]}=Break) ->
     case WinInfo#winInfo.editor of
 	{Mod, Editor} ->
 	    dbg_wx_code:add_break_to_code(Editor, Line, Status);
-	_ -> ignore
+	_ -> ok
     end,
     add_break_to_menu(WinInfo, Menu, Break).
 
@@ -372,7 +373,7 @@ update_break(WinInfo, {{Mod,Line},[Status|_Options]}=Break) ->
     case WinInfo#winInfo.editor of
 	{Mod, Editor} ->
 	    dbg_wx_code:add_break_to_code(Editor, Line, Status);
-	_ -> ignore
+	_ -> ok
     end,
     update_break_in_menu(WinInfo, Break).
 
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index 1ff8818bbe..25ffc5054c 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -43,7 +43,8 @@
 %%   GS = term()
 %%--------------------------------------------------------------------
 init() ->
-    wx:new().
+    _ = wx:new(),
+    ok.
 
 %%--------------------------------------------------------------------
 %% create_menus(MenuBar, [Menu])
@@ -80,12 +81,12 @@ create_menus(_MB,[], _Win,Id) ->
     Id.
 
 create_menu_item(Menu, [separator|Is], Win, Id,Connect) ->
-    wxMenu:appendSeparator(Menu),
+    _ = wxMenu:appendSeparator(Menu),
     create_menu_item(Menu,Is,Win,Id+1,Connect);
 create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
     Sub = wxMenu:new([]),
     Id = create_menu_item(Sub, Items, Win, Id0, false),
-    wxMenu:append(Menu, ?wxID_ANY, menu_name(Name,ignore), Sub),
+    _ = wxMenu:append(Menu, ?wxID_ANY, menu_name(Name,ignore), Sub),
     %% Simulate GS sub checkBox/RadioBox behaviour
     Self = self(),
     Butts = [{MI,get(MI)} || {MI,_,_} <- Items],
@@ -99,8 +100,8 @@ create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
 		     Enabled = lists:foldl(IsChecked, [], Butts),
 		     Self ! Ev#wx{userData={Name, Enabled}}
 	     end,
-    wxMenu:connect(Win, command_menu_selected, 
-		   [{id,Id0},{lastId, Id-1},{callback,Filter}]),
+    _ = wxMenu:connect(Win, command_menu_selected,
+		       [{id,Id0},{lastId, Id-1},{callback,Filter}]),
     create_menu_item(Menu, Is, Win, Id, Connect);
 create_menu_item(Menu, [{Name,Pos}|Is], Win, Id, Connect) -> 
     MenuId = case lists:member(Name, ['Debugger']) of
@@ -168,7 +169,7 @@ add_break(Win, MenuName, Point) ->
     Delete = wxMenu:appendRadioItem(Trigger, ?wxID_ANY,"Delete"),
     Add(Delete, {break,Point,{trigger,delete}}),
 
-    wxMenu:append(Sub, ?wxID_ANY, "Trigger Action", Trigger),
+    _ = wxMenu:append(Sub, ?wxID_ANY, "Trigger Action", Trigger),
     MenuBtn = wxMenu:append(Menu,?wxID_ANY, Label, Sub),
 
     #break{mb={Menu,MenuBtn}, 
diff --git a/lib/debugger/src/dbg_wx_winman.erl b/lib/debugger/src/dbg_wx_winman.erl
index efa58ae325..ca858fa4bb 100644
--- a/lib/debugger/src/dbg_wx_winman.erl
+++ b/lib/debugger/src/dbg_wx_winman.erl
@@ -100,11 +100,11 @@ update_windows_menu(Win, [MonInfo|Infos]) ->
     OldItems = wxMenu:getMenuItems(Menu),
     [wxMenu:delete(Menu, Item) || Item <- OldItems],
     menuitem(Win, Menu,MonInfo, 700),
-    wxMenu:appendSeparator(Menu),
+    _ = wxMenu:appendSeparator(Menu),
     wx:foldl(fun(Info,Acc) -> menuitem(Win,Menu,Info,Acc) end, 701, Infos).
 
 menuitem(Window, Menu, {Title, Win}, Id) ->
-    wxMenu:append(Menu, Id, Title),
+    _ = wxMenu:append(Menu, Id, Title),
     wxWindow:connect(Window, command_menu_selected, 
 		     [{id,Id},{userData,{dbg_ui_winman,Win}}]),
     Id+1.