return true from IsDoubleBuffered() if our TLW parent is a composited window; the...

[wxWidgets.git] / tests / net / ipc.cpp

diff --git a/tests/net/ipc.cpp b/tests/net/ipc.cpp
index 5ca82bd3e41a48378b2331031ff72e5cb7ec86d2..735cbcf58f37402fd435fe2fc23672e0ee3748b4 100644 (file)
--- a/tests/net/ipc.cpp
+++ b/tests/net/ipc.cpp
@@ -15,16 +15,19 @@
     #pragma hdrstop
 #endif
 
+// this test needs threads as it runs the test server in a secondary thread
+#if wxUSE_THREADS
+
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
 #endif
 
-// this test needs threads as it runs the test server in a secondary thread
-#if wxUSE_THREADS
-
 #include "wx/ipc.h"
 #include "wx/thread.h"
 
+#define wxUSE_SOCKETS_FOR_IPC (!wxUSE_DDE_FOR_IPC)
+
 namespace
 {
 
@@ -90,8 +93,10 @@ public:
     {
         m_conn = NULL;
 
+#if wxUSE_SOCKETS_FOR_IPC
         // we must call this from the main thread
         wxSocketBase::Initialize();
+#endif // wxUSE_SOCKETS_FOR_IPC
 
         // we need event dispatching to work for IPC server to work
         m_thread = new EventThread;
@@ -105,9 +110,12 @@ public:
 
         m_thread->Wait();
         delete m_thread;
-        m_thread = NULL;
 
+        delete m_conn;
+
+#if wxUSE_SOCKETS_FOR_IPC
         wxSocketBase::Shutdown();
+#endif // wxUSE_SOCKETS_FOR_IPC
     }
 
     virtual wxConnectionBase *OnAcceptConnection(const wxString& topic)
@@ -200,8 +208,7 @@ private:
     DECLARE_NO_COPY_CLASS(IPCTestCase)
 };
 
-// this test is not enabled by default because it requires an IPC server to run
-//CPPUNIT_TEST_SUITE_REGISTRATION( IPCTestCase );
+CPPUNIT_TEST_SUITE_REGISTRATION( IPCTestCase );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCTestCase, "IPCTestCase" );
 
 void IPCTestCase::Connect()