summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2007-02-01 09:56:18 +0000
committerfcolin2007-02-01 09:56:18 +0000
commitd035b308f89d50494e652fc7889f3f2399072cd5 (patch)
tree1a251ab1b35995ad55a76cc381f18f21cf5e62a3
parent91bd8eb5c7b7e982b0aee3c83dd7884891ca35dc (diff)
downloadivy-csharp-d035b308f89d50494e652fc7889f3f2399072cd5.zip
ivy-csharp-d035b308f89d50494e652fc7889f3f2399072cd5.tar.gz
ivy-csharp-d035b308f89d50494e652fc7889f3f2399072cd5.tar.bz2
ivy-csharp-d035b308f89d50494e652fc7889f3f2399072cd5.tar.xz
Utilisateur : Fcolin Date : 30/06/06 Heure : 17:20 Archivé dans $/CSharp/Ivy/Ivy Commentaire: (vss 71)
-rw-r--r--CSharp/Ivy/IvyPPC/Ivy.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/CSharp/Ivy/IvyPPC/Ivy.cs b/CSharp/Ivy/IvyPPC/Ivy.cs
index 892ed0f..af5096f 100644
--- a/CSharp/Ivy/IvyPPC/Ivy.cs
+++ b/CSharp/Ivy/IvyPPC/Ivy.cs
@@ -226,10 +226,11 @@ namespace IvyBus
+
+#if (PocketPC)
#if (!PocketPC)
[Category("Ivy")]
#endif
-#if (PocketPC)
[DefaultValue(null)]
public System.Windows.Forms.ContainerControl ContainerControl
{
@@ -775,7 +776,7 @@ namespace IvyBus
IvyEventArgs args = (IvyEventArgs)state;
ev(this, args);
};
- syncContext.Send(update, e);
+ syncContext.Post(update, e);
}
else
ev(this, e);
@@ -803,6 +804,10 @@ namespace IvyBus
{
FireEvent(temp,e);
}
+ catch (SynchronizationLockException ex)
+ {
+ // protect terminaison
+ }
catch (ObjectDisposedException)
{
// protect terminaison
@@ -863,7 +868,7 @@ namespace IvyBus
IvyDieEventArgs args = (IvyDieEventArgs)state;
temp(this, args);
};
- syncContext.Send(update, e);
+ syncContext.Post(update, e);
}
else
temp(this, e);
@@ -878,7 +883,11 @@ namespace IvyBus
{
throw new IvyException("(callCallback) Not regexp matching id " + e.Id);
}
+#if(PocketPC)
bind.Firevent(parentControl, e);
+#else
+ bind.Firevent(syncContext, e);
+#endif
}
/*