Mark Widget::destroy as unsafe

GuillaumeGomez · Feb 20, 2020 · 043fe42 · 043fe42
1 parent 61b2f4f
commit 043fe42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Gir.toml b/Gir.toml
@@ -2458,6 +2458,10 @@ manual_traits = ["WidgetExtManual"]
     [[object.function]]
     name = "get_name"
     rename = "get_widget_name"
+    [[object.function]]
+    name = "destroy"
+    # needs to be marked as unsafe
+    ignore = true
 
 [[object]]
 name = "Gtk.Window"

diff --git a/src/auto/widget.rs b/src/auto/widget.rs
@@ -106,8 +106,6 @@ pub trait WidgetExt: 'static {
 
     fn create_pango_layout(&self, text: Option<&str>) -> Option<pango::Layout>;
 
-    fn destroy(&self);
-
     //fn destroyed<P: IsA<Widget>>(&self, widget_pointer: &P);
 
     fn device_is_shadowed(&self, device: &gdk::Device) -> bool;
@@ -1117,12 +1115,6 @@ impl<O: IsA<Widget>> WidgetExt for O {
         }
     }
 
-    fn destroy(&self) {
-        unsafe {
-            gtk_sys::gtk_widget_destroy(self.as_ref().to_glib_none().0);
-        }
-    }
-
     //fn destroyed<P: IsA<Widget>>(&self, widget_pointer: &P) {
     //    unsafe { TODO: call gtk_sys:gtk_widget_destroyed() }
     //}

diff --git a/src/widget.rs b/src/widget.rs
@@ -60,6 +60,8 @@ pub trait WidgetExtManual: 'static {
     fn add_events(&self, events: gdk::EventMask);
     fn get_events(&self) -> gdk::EventMask;
     fn set_events(&self, events: gdk::EventMask);
+
+    unsafe fn destroy(&self);
 }
 
 impl<O: IsA<Widget>> WidgetExtManual for O {
@@ -236,4 +238,8 @@ impl<O: IsA<Widget>> WidgetExtManual for O {
             gtk_sys::gtk_widget_set_events(self.as_ref().to_glib_none().0, events.to_glib() as i32);
         }
     }
+
+    unsafe fn destroy(&self) {
+        gtk_sys::gtk_widget_destroy(self.as_ref().to_glib_none().0);
+    }
 }