diff options
| author | Dan Gudmundsson <[email protected]> | 2011-05-11 16:05:52 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-05-11 16:05:52 +0200 |
| commit | 0a80859714d86191e17f84cf60833010b20655d0 (patch) | |
| tree | 63b6304bf9df591beee2a456be1efaa3f0c77008 /lib/et/src/et_wx_contents_viewer.erl | |
| parent | 116deb98aa1309039d06530de3351feec1163c3f (diff) | |
| parent | d3d2a66af3b7a4a29d3f5ba477a81c7e6f147653 (diff) | |
| download | otp-0a80859714d86191e17f84cf60833010b20655d0.tar.gz otp-0a80859714d86191e17f84cf60833010b20655d0.tar.bz2 otp-0a80859714d86191e17f84cf60833010b20655d0.zip | |
Merge branch 'dgud/et/window-fix/OTP-9238' into dev
* dgud/et/window-fix/OTP-9238:
Windows fixes, content_viewer window size was wrong and removed focus stealing
Diffstat (limited to 'lib/et/src/et_wx_contents_viewer.erl')
| -rw-r--r-- | lib/et/src/et_wx_contents_viewer.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl index aada184a76..86f46f25d0 100644 --- a/lib/et/src/et_wx_contents_viewer.erl +++ b/lib/et/src/et_wx_contents_viewer.erl @@ -464,7 +464,8 @@ create_window(S) -> wxFrame:setMenuBar(Frame,Bar), create_file_menu(Bar), Editor = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, 0 - bor ?wxDEFAULT + bor ?wxDEFAULT + bor ?wxTE_RICH2 %% Needed on Windows bor ?wxTE_MULTILINE bor ?wxTE_READONLY bor ?wxTE_DONTWRAP}]), @@ -483,6 +484,7 @@ create_window(S) -> wxFrame:connect(Frame, close_window, [{skip,true}]), wxFrame:setFocus(Frame), wxPanel:setSizer(Panel, Sizer), + wxSizer:fit(Sizer, Panel), wxFrame:show(Frame), S2#state{menu_data = HideData++SearchData++FilterData, editor = Editor, frame = Frame}. |