All Widgets can be deleted

finanalyst · May 17, 2016 · 73019f8 · 73019f8
1 parent f855cc6
commit 73019f8
Showing 1 changed file with 17 additions and 31 deletions.
diff --git a/lib/GTK/Simple.pm6 b/lib/GTK/Simple.pm6
@@ -228,6 +228,22 @@ role GTK::Simple::Widget {
     method hide() {
         gtk_widget_show($!gtk_widget);
     }
+
+    # All widgets get the 'delete-event'
+    has $!deleted_supply;
+    #| Tap this supply to react to the window being closed
+    method deleted() {
+        $!deleted_supply //= do {
+            my $s = Supplier.new;
+            g_signal_connect_wd($!gtk_widget, "delete-event",
+                -> $, $ {
+                    $s.emit(self);
+                    CATCH { default { note $_; } }
+                },
+                OpaquePointer, 0);
+            $s.Supply;
+        }
+    }
 }
 
 role GTK::Simple::Container {
@@ -284,22 +300,6 @@ class GTK::Simple::Window does GTK::Simple::Widget
         $!gtk_widget = gtk_window_new(0);
         gtk_window_set_title($!gtk_widget, $title.Str);
     }
-
-    has $!deleted_supply;
-    #| Tap this supply to react to the window being closed
-    method deleted() {
-        $!deleted_supply //= do {
-            my $s = Supplier.new;
-            g_signal_connect_wd($!gtk_widget, "delete-event",
-                -> $, $ {
-                    $s.emit(self);
-                    CATCH { default { note $_; } }
-                },
-                OpaquePointer, 0);
-            $s.Supply
-        }
-    }
-
 }
 
 class GTK::Simple::App does GTK::Simple::Widget
@@ -340,23 +340,9 @@ class GTK::Simple::App does GTK::Simple::Widget
         gtk_main_quit();
     }
 
-    has $!deleted_supply;
-    #| Tap this supply to react to the window being closed
-    method deleted() {
-        $!deleted_supply //= do {
-            my $s = Supplier.new;
-            g_signal_connect_wd($!gtk_widget, "delete-event",
-                -> $, $ {
-                    $s.emit(self);
-                    CATCH { default { note $_; } }
-                },
-                OpaquePointer, 0);
-            $s.Supply;
-        }
-    }
 
     method run() {
-        gtk_widget_show($!gtk_widget);
+        self.show();
         gtk_main();
     }