Re-enabled ModuleInit/ModuleExit methods

mono · Nov 8, 2010 · 638d911 · 638d911
1 parent db20e13
commit 638d911
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/Maigre/Maigre.Osx/OsxTheme.cs b/Maigre/Maigre.Osx/OsxTheme.cs
@@ -31,6 +31,11 @@ namespace Maigre.Osx
 {
     public class OsxTheme : Theme
     {
+        protected override void ModuleInit ()
+        {
+            Console.WriteLine ("OsxTheme::ModuleInit");
+        }
+
         protected override void DrawBox ()
         {
             switch (Detail) {

diff --git a/Maigre/Maigre/Theme.cs b/Maigre/Maigre/Theme.cs
@@ -1,5 +1,5 @@
 // 
-// Style.cs
+// Theme.cs
 //  
 // Author:
 //   Aaron Bockover <abockover@novell.com>
@@ -34,6 +34,24 @@ public Theme ()
         {
         }
 
+        private void ProxyModuleInit ()
+        {
+            ModuleInit ();
+        }
+
+        protected virtual void ModuleInit ()
+        {
+        }
+
+        private void ProxyModuleExit ()
+        {
+            ModuleExit ();
+        }
+
+        protected virtual void ModuleExit ()
+        {
+        }
+
         public static Theme Create ()
         {
             return new Maigre.Osx.OsxTheme ();

diff --git a/libmaigre/maigre-theme-module.c b/libmaigre/maigre-theme-module.c
@@ -47,10 +47,11 @@ theme_init (GTypeModule *module)
 
     maigre_rc_style_register_types (module);
 
-    /*if ((init_method =
-        mono_class_get_method_from_name (bridge->theme_class, "ModuleInit", 0)) != NULL) {
-        mono_runtime_invoke (init_method, NULL, NULL, NULL);
-    }*/
+    if ((init_method =
+        mono_class_get_method_from_name (bridge->theme_class,
+            "ProxyModuleInit", 0)) != NULL) {
+        mono_runtime_invoke (init_method, bridge->theme_object, NULL, NULL);
+    }
 }
 
 G_MODULE_EXPORT void
@@ -59,10 +60,11 @@ theme_exit ()
     MonoMethod *exit_method;
     MaigreMonoBridge *bridge = maigre_mono_bridge ();
 
-    /*if (bridge->init_success && (exit_method =
-        mono_class_get_method_from_name (bridge->theme_class, "ModuleExit", 0)) != NULL) {
-        mono_runtime_invoke (exit_method, NULL, NULL, NULL);
-    }*/
+    if (bridge->init_success && (exit_method =
+        mono_class_get_method_from_name (bridge->theme_class,
+            "ProxyModuleExit", 0)) != NULL) {
+        mono_runtime_invoke (exit_method, bridge->theme_object, NULL, NULL);
+    }
 }
 
 G_MODULE_EXPORT GtkRcStyle *