diff options
| author | Dan Gudmundsson <[email protected]> | 2017-04-03 11:43:40 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-04-03 11:43:40 +0200 |
| commit | a7b73658b03f1a09d4af4d0b8250a1d5e613e378 (patch) | |
| tree | d8a4221c5131c53ed2efc3a5c98d28be3d53abba /lib/observer/src/observer_app_wx.erl | |
| parent | 6604585547b8e84d53aac174182cfb06289bbf73 (diff) | |
| parent | 1f205a59ab61f159920b41d5f17f207299cb7a8c (diff) | |
| download | otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.tar.gz otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.tar.bz2 otp-a7b73658b03f1a09d4af4d0b8250a1d5e613e378.zip | |
Merge branch 'dgud/observer/keep-selection/OTP-14270'
* dgud/observer/keep-selection/OTP-14270:
observer: (re)store config
observer: Use event info to get active tab
observer: Keep sel after column change tv
observer: Keep port selection after refresh
observer: Keep tv selection after refresh
Diffstat (limited to 'lib/observer/src/observer_app_wx.erl')
| -rw-r--r-- | lib/observer/src/observer_app_wx.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl index 80a41fdde9..63ca3aeba7 100644 --- a/lib/observer/src/observer_app_wx.erl +++ b/lib/observer/src/observer_app_wx.erl @@ -18,7 +18,7 @@ %% %CopyrightEnd% -module(observer_app_wx). --export([start_link/2]). +-export([start_link/3]). %% wx_object callbacks -export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3, @@ -73,10 +73,10 @@ -define(wxGC, wxGraphicsContext). -start_link(Notebook, Parent) -> - wx_object:start_link(?MODULE, [Notebook, Parent], []). +start_link(Notebook, Parent, Config) -> + wx_object:start_link(?MODULE, [Notebook, Parent, Config], []). -init([Notebook, Parent]) -> +init([Notebook, Parent, _Config]) -> Panel = wxPanel:new(Notebook, [{size, wxWindow:getClientSize(Notebook)}, {winid, 1} ]), @@ -258,6 +258,8 @@ handle_sync_event(#wx{event = #wxPaint{}},_, destroy_gc(GC), ok. %%%%%%%%%% +handle_call(get_config, _, State) -> + {reply, #{}, State}; handle_call(Event, From, _State) -> error({unhandled_call, Event, From}). |