Merge pull request #9 from alatiera/alatiera/subclasss-override

subclass: Always allow to override the vfuns of classes

Author: sdroege

src/subclass/application_window.rs

@@ -2,11 +2,14 @@ use glib::subclass::prelude::*;
 
 use super::window::WindowImpl;
 use ApplicationWindowClass;
+use WindowClass;
 
 pub trait ApplicationWindowImpl: WindowImpl + 'static {}
 
 unsafe impl<T: ObjectSubclass + ApplicationWindowImpl> IsSubclassable<T>
     for ApplicationWindowClass
 {
-    fn override_vfuncs(&mut self) {}
+    fn override_vfuncs(&mut self) {
+        <WindowClass as IsSubclassable<T>>::override_vfuncs(self);
+    }
 }

src/subclass/bin.rs

@@ -2,9 +2,12 @@ use glib::subclass::prelude::*;
 
 use super::container::ContainerImpl;
 use BinClass;
+use ContainerClass;
 
 pub trait BinImpl: ContainerImpl + 'static {}
 
 unsafe impl<T: ObjectSubclass + BinImpl> IsSubclassable<T> for BinClass {
-    fn override_vfuncs(&mut self) {}
+    fn override_vfuncs(&mut self) {
+        <ContainerClass as IsSubclassable<T>>::override_vfuncs(self);
+    }
 }

src/subclass/box_.rs

@@ -2,9 +2,12 @@ use glib::subclass::prelude::*;
 
 use super::container::ContainerImpl;
 use BoxClass;
+use ContainerClass;
 
 pub trait BoxImpl: ContainerImpl + 'static {}
 
 unsafe impl<T: ObjectSubclass + BoxImpl> IsSubclassable<T> for BoxClass {
-    fn override_vfuncs(&mut self) {}
+    fn override_vfuncs(&mut self) {
+        <ContainerClass as IsSubclassable<T>>::override_vfuncs(self);
+    }
 }

src/subclass/container.rs

@@ -8,6 +8,7 @@ use super::widget::WidgetImpl;
 use Container;
 use ContainerClass;
 use Widget;
+use WidgetClass;
 use WidgetPath;
 
 pub trait ContainerImpl: ContainerImplExt + WidgetImpl + 'static {
@@ -99,6 +100,7 @@ impl<T: ContainerImpl + ObjectImpl> ContainerImplExt for T {
 
 unsafe impl<T: ObjectSubclass + ContainerImpl> IsSubclassable<T> for ContainerClass {
     fn override_vfuncs(&mut self) {
+        <WidgetClass as IsSubclassable<T>>::override_vfuncs(self);
         unsafe {
             let klass = &mut *(self as *mut Self as *mut gtk_sys::GtkContainerClass);
             klass.add = Some(container_add::<T>);

src/subclass/dialog.rs

@@ -8,6 +8,7 @@ use super::window::WindowImpl;
 use Dialog;
 use DialogClass;
 use ResponseType;
+use WindowClass;
 
 pub trait DialogImpl: DialogImplExt + WindowImpl + 'static {
     fn response(&self, dialog: &Dialog, response: ResponseType) {
@@ -50,6 +51,7 @@ impl<T: DialogImpl + ObjectImpl> DialogImplExt for T {
 
 unsafe impl<T: ObjectSubclass + DialogImpl> IsSubclassable<T> for DialogClass {
     fn override_vfuncs(&mut self) {
+        <WindowClass as IsSubclassable<T>>::override_vfuncs(self);
         unsafe {
             let klass = &mut *(self as *mut Self as *mut gtk_sys::GtkDialogClass);
             klass.response = Some(dialog_response::<T>);

src/subclass/header_bar.rs

@@ -1,10 +1,13 @@
 use glib::subclass::prelude::*;
 
 use super::container::ContainerImpl;
+use ContainerClass;
 use HeaderBarClass;
 
 pub trait HeaderBarImpl: ContainerImpl + 'static {}
 
 unsafe impl<T: ObjectSubclass + HeaderBarImpl> IsSubclassable<T> for HeaderBarClass {
-    fn override_vfuncs(&mut self) {}
+    fn override_vfuncs(&mut self) {
+        <ContainerClass as IsSubclassable<T>>::override_vfuncs(self);
+    }
 }

src/subclass/widget.rs

@@ -3,6 +3,7 @@ use gtk_sys;
 use glib::translate::*;
 
 use glib::subclass::prelude::*;
+use glib::ObjectClass;
 
 use crate::DragResult;
 use crate::SelectionData;
@@ -292,6 +293,7 @@ impl<T: WidgetImpl + ObjectImpl> WidgetImplExt for T {
 
 unsafe impl<T: ObjectSubclass + WidgetImpl> IsSubclassable<T> for WidgetClass {
     fn override_vfuncs(&mut self) {
+        <ObjectClass as IsSubclassable<T>>::override_vfuncs(self);
         unsafe {
             let klass = &mut *(self as *mut Self as *mut gtk_sys::GtkWidgetClass);
             // klass.can_activate_accel = Some(widget_can_activate_accel::<T>);

src/subclass/window.rs

@@ -5,6 +5,7 @@ use glib::translate::*;
 use glib::subclass::prelude::*;
 
 use super::bin::BinImpl;
+use BinClass;
 use Window;
 use WindowClass;
 
@@ -97,6 +98,7 @@ impl<T: WindowImpl + ObjectImpl> WindowImplExt for T {
 
 unsafe impl<T: ObjectSubclass + WindowImpl> IsSubclassable<T> for WindowClass {
     fn override_vfuncs(&mut self) {
+        <BinClass as IsSubclassable<T>>::override_vfuncs(self);
         unsafe {
             let klass = &mut *(self as *mut Self as *mut gtk_sys::GtkWindowClass);
             klass.activate_focus = Some(window_activate_focus::<T>);