summaryrefslogtreecommitdiff
path: root/CSharp/Ivy
diff options
context:
space:
mode:
authorfcolin2007-02-01 09:44:23 +0000
committerfcolin2007-02-01 09:44:23 +0000
commit33b77db55598104786ee41a7a4dc83a18fec7075 (patch)
tree22e5be746f29c436f87b6f5c57ff4fbcf09edc97 /CSharp/Ivy
parent34ed1bccaf5ed6dfeddfdf62a2f082e6eae65daf (diff)
downloadivy-csharp-33b77db55598104786ee41a7a4dc83a18fec7075.zip
ivy-csharp-33b77db55598104786ee41a7a4dc83a18fec7075.tar.gz
ivy-csharp-33b77db55598104786ee41a7a4dc83a18fec7075.tar.bz2
ivy-csharp-33b77db55598104786ee41a7a4dc83a18fec7075.tar.xz
Utilisateur : Fcolin Date : 30/06/06 Heure : 17:20 Archivé dans $/CSharp/Ivy/Ivy Commentaire: (vss 71)
Diffstat (limited to 'CSharp/Ivy')
-rw-r--r--CSharp/Ivy/Ivy/Ivy.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/CSharp/Ivy/Ivy/Ivy.cs b/CSharp/Ivy/Ivy/Ivy.cs
index 892ed0f..af5096f 100644
--- a/CSharp/Ivy/Ivy/Ivy.cs
+++ b/CSharp/Ivy/Ivy/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
}
/*