* Changed sock->SetFlags(SPEED); to sock->SetFlags(wxSOCKET_NOWAIT); to

  get it working with the new wxSockets API.  Thanks to Steve Yelvington
  for this fix.

diff --git a/daphne/ChangeLog b/daphne/ChangeLog
index fe38cec934572a9549e7b71c067dc22a3641fde2..c65ed13cbbd05708c5909e1932de4aad84654b0d 100644 (file)
--- a/daphne/ChangeLog
+++ b/daphne/ChangeLog
@@ -1,22 +1,9 @@
-<<<<<<< ChangeLog
 $Log$
-Revision 1.17  2000/01/26 18:42:24  smw
-Fixed enter so it's stable again.
-Made minor tweaks for compatibility between wxGTK and wxMSW
-Fixed roomview so that 'skip' shows up again in button bar
-Still working on windoze images.  They're only showing half-height.
-Fixed wholist so that it fires up maximized.  Fixed the button problems
-in 'wholist' under wxMSW.
-REfixed roomtree.cpp so that under wxMSW it is clickable again.
-Certain things here are for tests.  DoChat was one of them.  This is not
-yet a release version of the software, LS, so please don't give me crap
-about things I'm testing.
+Revision 1.18  2000/04/20 02:49:43  ajc
+* Changed sock->SetFlags(SPEED); to sock->SetFlags(wxSOCKET_NOWAIT); to
+  get it working with the new wxSockets API.  Thanks to Steve Yelvington
+  for this fix.
 
-Revision 1.15  2000/01/08 20:25:21  smw
-Fixed a condition in goto where the message window would eat itself
-prior to importing the messages, forcing daphne to crash.
-=======
-$Log$
 Revision 1.17  2000/01/26 18:42:24  smw
 Fixed enter so it's stable again.
 Made minor tweaks for compatibility between wxGTK and wxMSW

diff --git a/daphne/citclient.cpp b/daphne/citclient.cpp
index 1247bc687255a72f17c2edf1b7a6aa8296920528..8aa2fcae611ff9191b4201b4f137684d9168a1a8 100644 (file)
--- a/daphne/citclient.cpp
+++ b/daphne/citclient.cpp
@@ -45,7 +45,7 @@ CitClient::CitClient(void) {
 
        // Guilhem Lavaux suggested using the SPEED flag to keep from
        // blocking, but it just freezes the app in mid-transaction.
-       sock->SetFlags(wxSocketBase::SPEED);
+       sock->SetFlags(wxSOCKET_NOWAIT);
 
         //wxSocketHandler::Master().Register(sock);
         // sock->SetNotify(wxSocketBase::REQ_LOST);