diff options
| author | Dan Gudmundsson <[email protected]> | 2013-01-15 09:19:32 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-15 09:19:32 +0100 |
| commit | 0324fe0502d843830e6fe128e307601f21a60f26 (patch) | |
| tree | 299db89395e593c0eded9790e69992259ca60058 /lib/debugger/src/dbg_wx_trace_win.erl | |
| parent | 364ec900a6f974e7bc184bb3d5d67e85765353e0 (diff) | |
| parent | 7f048c5d71534d458351513e84bb879c47f2c76e (diff) | |
| download | otp-0324fe0502d843830e6fe128e307601f21a60f26.tar.gz otp-0324fe0502d843830e6fe128e307601f21a60f26.tar.bz2 otp-0324fe0502d843830e6fe128e307601f21a60f26.zip | |
Merge branch 'dgud/debugger/unicode/OTP-10679'
* dgud/debugger/unicode/OTP-10679:
debugger: View terms as unicode-strings
debugger: Fix code viewing on wxWidgets-2.9
debugger: Remove bad gs:call
debugger: Fix user evalution dependent of bindings in trace window
Diffstat (limited to 'lib/debugger/src/dbg_wx_trace_win.erl')
| -rw-r--r-- | lib/debugger/src/dbg_wx_trace_win.erl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/debugger/src/dbg_wx_trace_win.erl b/lib/debugger/src/dbg_wx_trace_win.erl index 40d110f071..8b206ccd78 100644 --- a/lib/debugger/src/dbg_wx_trace_win.erl +++ b/lib/debugger/src/dbg_wx_trace_win.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2012. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -19,7 +19,6 @@ %% -module(dbg_wx_trace_win). --compile([{nowarn_deprecated_function,{gs,config,2}}]). %% External exports -export([init/0, stop/1]). @@ -481,13 +480,9 @@ display(#winInfo{window=Win, sb=Sb},Arg) -> %% Contents = string() %% Note: remove_code/2 should not be used for currently shown module. %%-------------------------------------------------------------------- -is_shown(WinInfo, Mod) -> - case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of - {Mod, Editor} -> - gs:config(Editor, raise), %% BUGBUG - {true, WinInfo#winInfo{editor={Mod, Editor}}}; - false -> false - end. +is_shown(_WinInfo, _Mod) -> + %% Previously cached modules here, nyi so return false + false. show_code(WinInfo = #winInfo{editor={_, Ed}}, Mod, Contents) -> %% Insert code and update breakpoints, if any @@ -572,7 +567,7 @@ update_bindings(#winInfo{bind=#sub{out=BA}}, Bs) -> wx:foldl(fun({Var,Val},Row) -> wxListCtrl:insertItem(BA, Row, ""), wxListCtrl:setItem(BA, Row, 0, dbg_wx_win:to_string(Var)), - wxListCtrl:setItem(BA, Row, 1, dbg_wx_win:to_string("~500P",[Val, 80])), + wxListCtrl:setItem(BA, Row, 1, dbg_wx_win:to_string("~99999tP",[Val, 20])), Row+1 end, 0, Bs), put(bindings,Bs), |