debug dyn event handle clearing

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 508acc2d13406f82664cdf79417176d8b8dd972c..13576b241f07bdecfef0e74883afc863dc74e0a7 100644 (file)
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -44,8 +44,8 @@ namespace test
                        "testSpinner.goml",\r
                        "testPopper.goml",\r
                        "testGroupBox.goml",\r
-//                     "testWindow.goml",\r
-//                     "testMsgBox.goml",\r
+                       "testWindow.goml",\r
+                       "testMsgBox.goml",\r
                        "testGrid.goml",\r
                        "testMeter.goml",\r
 //                     "testCombobox.goml",\r

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 505e85a9a6115bafc01545704d0476bca7061e3c..6e2d726c4dd06bed408385e8b3234c56ff68d15d 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -1285,16 +1285,22 @@ namespace go
                        foreach (Binding b in Bindings) {\r
                                if (string.IsNullOrEmpty (b.DynMethodId))\r
                                        continue;\r
-                               Type dataSourceType = b.Target.Instance.GetType ();\r
+                               MemberReference mr = null;\r
+                               if (b.Target == null)\r
+                                       mr = b.Source;\r
+                               else\r
+                                       mr = b.Target;\r
+                               Type dataSourceType = mr.Instance.GetType();\r
                                EventInfo evtInfo = dataSourceType.GetEvent ("ValueChanged");\r
                                FieldInfo evtFi = CompilerServices.GetEventHandlerField (dataSourceType, "ValueChanged");\r
-                               MulticastDelegate multicastDelegate = evtFi.GetValue (b.Target.Instance) as MulticastDelegate;\r
+                               MulticastDelegate multicastDelegate = evtFi.GetValue (mr.Instance) as MulticastDelegate;\r
                                if (multicastDelegate != null) {                                \r
                                        foreach (Delegate d in multicastDelegate.GetInvocationList()) {                                         \r
                                                if (d.Method.Name == b.DynMethodId)\r
-                                                       evtInfo.RemoveEventHandler (b.Target.Instance, d);\r
+                                                       evtInfo.RemoveEventHandler (mr.Instance, d);\r
                                        }\r
                                }\r
+                               b.Reset ();\r
                        }\r
                }\r
        }\r