summaryrefslogtreecommitdiff
path: root/Ivy/Ivy.cxx
diff options
context:
space:
mode:
authorfcolin2010-03-12 16:41:08 +0000
committerfcolin2010-03-12 16:41:08 +0000
commit576ad2b67bced04bde83de91f5e647af868c5fd4 (patch)
tree147725b5c27f1f31da1e879ac949822c75ac49a2 /Ivy/Ivy.cxx
parent74c0ac487332231e8dd6ba35580b07166ffbcfe2 (diff)
downloadivy-cplusplus-576ad2b67bced04bde83de91f5e647af868c5fd4.zip
ivy-cplusplus-576ad2b67bced04bde83de91f5e647af868c5fd4.tar.gz
ivy-cplusplus-576ad2b67bced04bde83de91f5e647af868c5fd4.tar.bz2
ivy-cplusplus-576ad2b67bced04bde83de91f5e647af868c5fd4.tar.xz
mise en conformité des messages ping /pong
Correction pb a la fermeture d'ivy
Diffstat (limited to 'Ivy/Ivy.cxx')
-rw-r--r--Ivy/Ivy.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/Ivy/Ivy.cxx b/Ivy/Ivy.cxx
index 95035d1..1640b45 100644
--- a/Ivy/Ivy.cxx
+++ b/Ivy/Ivy.cxx
@@ -48,7 +48,7 @@ Ivy::~Ivy()
delete server;
if ( synchronous )
{
- delete IvySynchronousCallback::m_synchro;
+ IvySynchroWnd::Finish();
delete application_callback;
}
}
@@ -59,8 +59,8 @@ Ivy::Ivy(const char* name, const char * ready, IvyApplicationCallback *callback,
InitializeCriticalSection( &m_application_cs );
regexp_id = 0;
synchronous = Synchronous;
- if ( synchronous )
- IvySynchronousCallback::m_synchro = new IvySynchroWnd();
+ IvySynchroWnd::Init(synchronous);
+
ready_message = ready;
ApplicationName = name;
@@ -413,6 +413,10 @@ void Ivy::SetBindCallback( IvyBindingCallback* bind_callback )
{
binding_callback = synchronous ? new IvySynchronousBindingCallback(bind_callback) : bind_callback;
}
+void Ivy::SetDieCallback( IvyDieCallback* die_cb )
+{
+ die_callback = synchronous ? new IvySynchronousDieCallback(die_cb) : die_cb;
+}
void Ivy::SetFilter(int argc, const char **argv )
{