diff options
| author | Dan Gudmundsson <[email protected]> | 2014-05-26 14:31:53 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-05-26 14:31:53 +0200 |
| commit | 6731d295915448e4c219f1db1b146264ced68018 (patch) | |
| tree | b3e1e540b25295420be63bb2052495a97b4a1dbf /lib/observer/src/observer_wx.erl | |
| parent | ce2ea545b8833b8e31322cdcff82f14a9cad8ba8 (diff) | |
| parent | a9f3e2531be76b37c5ce13d20300d71fad0a7230 (diff) | |
| download | otp-6731d295915448e4c219f1db1b146264ced68018.tar.gz otp-6731d295915448e4c219f1db1b146264ced68018.tar.bz2 otp-6731d295915448e4c219f1db1b146264ced68018.zip | |
Merge branch 'dgud/observer/tests/OTP-11949' into maint
* dgud/observer/tests/OTP-11949:
observer: Let wx create statusbar
observer: Destroy the wx env
observer: Fix range check
Test Tweaks
Enable tests
Diffstat (limited to 'lib/observer/src/observer_wx.erl')
| -rw-r--r-- | lib/observer/src/observer_wx.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl index ced26f7119..03ca1bf9c1 100644 --- a/lib/observer/src/observer_wx.erl +++ b/lib/observer/src/observer_wx.erl @@ -112,7 +112,8 @@ setup(#state{frame = Frame} = State) -> observer_lib:create_menus(DefMenus, MenuBar, default), wxFrame:setMenuBar(Frame, MenuBar), - StatusBar = wxFrame:createStatusBar(Frame, []), + StatusBar = wxStatusBar:new(Frame), + wxFrame:setStatusBar(Frame, StatusBar), wxFrame:setTitle(Frame, atom_to_list(node())), wxStatusBar:setStatusText(StatusBar, atom_to_list(node())), @@ -388,6 +389,7 @@ handle_info(_Info, State) -> terminate(_Reason, #state{frame = Frame}) -> wxFrame:destroy(Frame), + wx:destroy(), ok. code_change(_, _, State) -> |