From 2b104c80a79205472d29381d70aced3da7c9d3bf Mon Sep 17 00:00:00 2001 From: ijm7 Date: Wed, 3 Jan 2018 12:21:29 +0000 Subject: [PATCH] Fix merge errors --- src/smoltext.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/smoltext.erl b/src/smoltext.erl index 960c813..7405b4f 100644 --- a/src/smoltext.erl +++ b/src/smoltext.erl @@ -33,6 +33,8 @@ makeMenuBar() -> File = wxMenu:new(), wxMenu:append(File, 1, "New"), wxMenu:append(File, 2, "Open"), + wxMenu:append(File, 3, "Save"), + wxMenu:append(File, 4, "Save As"), wxMenu:append(File, ?wxID_EXIT, "Quit"), %Edit = wxMenu:new(), Help = wxMenu:new(), @@ -44,7 +46,7 @@ makeMenuBar() -> Menu. loop(State) -> - {Frame, _, _, _, Pid} = State, + {Frame, _, TextBox, Files, Pid} = State, receive #wx{event=#wxClose{}} -> closeWindow(Frame, Pid);