Remove old workarounds to get cut, copy, and paste working in embedded wxTextCtrl

[wxWidgets.git] / samples / sockets / baseserver.cpp

diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp
index ae511045fe154ab2130599bbe64692e91830ba9b..cf879de292d9ec31c80648cb139d4cae58ffbe94 100644 (file)
--- a/samples/sockets/baseserver.cpp
+++ b/samples/sockets/baseserver.cpp
@@ -342,8 +342,8 @@ int Server::OnExit()
         delete it->GetData();
     }
 
-    for(EList::compatibility_iterator it = m_eventWorkers.GetFirst(); it ; it->GetNext()) {
-        delete it->GetData();
+    for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2->GetNext()) {
+        delete it2->GetData();
     }
 
     m_threadWorkers.Clear();
@@ -429,13 +429,13 @@ void  Server::OnWorkerEvent(WorkerEvent& pEvent)
             break;
         }
     }
-    for(EList::compatibility_iterator it = m_eventWorkers.GetFirst(); it ; it = it->GetNext())
+    for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2 = it2->GetNext())
     {
-        if (it->GetData() == pEvent.m_sender)
+        if (it2->GetData() == pEvent.m_sender)
         {
             wxLogVerbose(wxT("Deleting event worker (%d left)"),m_eventWorkers.GetCount());
-            delete it->GetData();
-            m_eventWorkers.DeleteNode(it);
+            delete it2->GetData();
+            m_eventWorkers.DeleteNode(it2);
             if (!pEvent.m_workerFailed)
                 m_eventWorkersDone++;
             else
@@ -510,7 +510,7 @@ wxThread::ExitCode ThreadWorker::Entry()
 
         if (signature[0] == 0xCE)
         {
-            LogWorker(m_peer,_("This server does not support test2 from GUI client"));
+            LogWorker(m_peer,_("This server does not support test2 from GUI client"),LOG_ERROR);
             e.m_workerFailed = true;
             e.m_exit = true;
             return 0;
@@ -603,7 +603,7 @@ EventWorker::DoRead()
                     unsigned char type = m_signature[0];
                     if (type == 0xCE)
                     {
-                        LogWorker(m_peer,_("This server does not support test2 from GUI client"));
+                        LogWorker(m_peer,_("This server does not support test2 from GUI client"),LOG_ERROR);
                         m_written = -1; //wxSOCKET_LOST will interpret this as failure
                         m_socket->Close();
                     }