From f1fcd0785d7903d498bded40d529ddb2e37c77f6 Mon Sep 17 00:00:00 2001
From: Olga Bulat <obulat@gmail.com>
Date: Thu, 5 Apr 2018 09:29:01 +0300
Subject: [PATCH] Moved add_handler function to winforms.libs, added app.exit()
 implementation

Signed-off-by: obulat <obulat@gmail.com>
---
 src/winforms/toga_winforms/app.py    |  5 +----
 src/winforms/toga_winforms/libs.py   |  9 +++++++++
 src/winforms/toga_winforms/window.py | 18 +-----------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/winforms/toga_winforms/app.py b/src/winforms/toga_winforms/app.py
index ece70eea60..46470bcc75 100644
--- a/src/winforms/toga_winforms/app.py
+++ b/src/winforms/toga_winforms/app.py
@@ -42,9 +42,6 @@ def open_document(self, fileURL):
         '''Add a new document to this app.'''
         print("STUB: If you want to handle opening documents, implement App.open_document(fileURL)")
 
-    def create_menus(self):
-        self.interface.factory.not_implemented('App.create_menus()')
-
     def run_app(self):
         self.create()
         self.native.Run(self.interface.main_window._impl.native)
@@ -56,4 +53,4 @@ def main_loop(self):
         thread.Join()
 
     def exit(self):
-        self.interface.factory.not_implemented('App.exit()')
+        self.native.Exit()
diff --git a/src/winforms/toga_winforms/libs.py b/src/winforms/toga_winforms/libs.py
index bf1878b8be..fd89bea992 100644
--- a/src/winforms/toga_winforms/libs.py
+++ b/src/winforms/toga_winforms/libs.py
@@ -19,3 +19,12 @@ def TextAlignment(value):
         CENTER: ContentAlignment.MiddleCenter,
         JUSTIFY: ContentAlignment.MiddleLeft,
     }[value]
+
+
+def add_handler(cmd):
+    action = cmd.action
+
+    def handler(sender, event):
+        return action(None)
+
+    return handler
diff --git a/src/winforms/toga_winforms/window.py b/src/winforms/toga_winforms/window.py
index ef3af7fc5b..09d0be7496 100644
--- a/src/winforms/toga_winforms/window.py
+++ b/src/winforms/toga_winforms/window.py
@@ -2,7 +2,7 @@
 from toga import GROUP_BREAK, SECTION_BREAK
 from travertino.layout import Viewport
 
-from .libs import WinForms, Size
+from .libs import WinForms, Size, add_handler
 
 
 class WinFormsViewport:
@@ -51,28 +51,12 @@ def create_toolbar(self):
                 else:
                     item = WinForms.ToolStripMenuItem(cmd.label)
 
-                def add_handler(cmd):
-                    action = cmd.action
-
-                    def handler(sender, event):
-                        return action(None)
-
-                    return handler
-
                 item.Click += add_handler(cmd)
             self.toolbar_native.Items.Add(item)
 
     def create_menus(self):
         toga.Group.FILE.order = 0
 
-        def add_handler(cmd):
-            action = cmd.action
-
-            def handler(sender, event):
-                return action(None)
-
-            return handler
-
         # Only create the menu if the menu item index has been created.
         if hasattr(self, '_menu_items'):
             self._menu_items = {}