moved wxDash typedef to gdicmn.h

[wxWidgets.git] / src / common / protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 64939970e69828cf3d18d7a190911f0d2ac9f769..542752e318a1059446724592b96ceba8eab1cbc1 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -69,7 +69,8 @@ bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;
 
 {
   wxIPV4address addr;
 

-  if (!GetPeer(addr)) {
+  if (!GetPeer(addr))
+  {

     Close();
     return FALSE;
   }
     Close();
     return FALSE;
   }


@@ -77,6 +78,7 @@ bool wxProtocol::Reconnect()
     return FALSE;
   if (!Connect(addr))
     return FALSE;
     return FALSE;
   if (!Connect(addr))
     return FALSE;

+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -88,7 +90,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   bool found;
 
   avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
   bool found;
 
   avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();

-  if (sock->LastError() != 0 || avail == 0)
+  if (sock->Error() || avail == 0)

     return wxPROTO_NETERR;
 
   memcpy(tmp_str, tmp_buf, avail);
     return wxPROTO_NETERR;
 
   memcpy(tmp_str, tmp_buf, avail);


@@ -128,9 +130,7 @@ public:
   void OnExit();
 };
 
   void OnExit();
 };
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
 IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)

-#endif

 
 bool wxProtocolModule::OnInit()
 {
 
 bool wxProtocolModule::OnInit()
 {