Fix merge errors

ijm7 · Jan 3, 2018 · 2b104c8 · 2b104c8
1 parent f2ffe52
commit 2b104c8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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);