fix vertical mouse wheel event rotation value, sign was reversed in r74805

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

diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp
index b131981988c800ffa8a2bb253bee74648072e7e3..35b249c2b4a815dbfa27fe7991f9514f32ebf8a1 100644 (file)
--- a/samples/sockets/baseclient.cpp
+++ b/samples/sockets/baseclient.cpp
@@ -4,9 +4,8 @@
 // Author:      Lukasz Michalski
 // Modified by:
 // Created:     27.06.2005
 // Author:      Lukasz Michalski
 // Modified by:
 // Created:     27.06.2005

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Lukasz Michalski <lmichalski@sf.net>
 // Copyright:   (c) 2005 Lukasz Michalski <lmichalski@sf.net>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -306,9 +305,9 @@ Client::OnExit()
     return 0;
 }
 
     return 0;
 }
 

-// Create buffer to be sent by client. Buffer contains test indicator 
+// Create buffer to be sent by client. Buffer contains test indicator

 // message size and place for data
 // message size and place for data

-// msgsize parameter contains size of data in bytes and 
+// msgsize parameter contains size of data in bytes and

 // if input value does not fit into 250 bytes then
 // on exit is updated to new value that is multiply of 1024 bytes
 char*
 // if input value does not fit into 250 bytes then
 // on exit is updated to new value that is multiply of 1024 bytes
 char*


@@ -318,14 +317,14 @@ Client::CreateBuffer(int* msgsize)
     char* buf;
     //if message should have more than 256 bytes then set it as
     //test3 for compatibility with GUI server sample
     char* buf;
     //if message should have more than 256 bytes then set it as
     //test3 for compatibility with GUI server sample

-    if ((*msgsize) > 250) 
+    if ((*msgsize) > 250)

     {
         //send at least one kb of data
         int size = (*msgsize)/1024 + 1;
         //returned buffer will contain test indicator, message size in kb and data
         bufsize = size*1024+2;
         buf = new char[bufsize];
     {
         //send at least one kb of data
         int size = (*msgsize)/1024 + 1;
         //returned buffer will contain test indicator, message size in kb and data
         bufsize = size*1024+2;
         buf = new char[bufsize];

-        buf[0] = 0xDE; //second byte contains size in kilobytes
+        buf[0] = (unsigned char)0xDE; //second byte contains size in kilobytes

         buf[1] = (char)(size);
         *msgsize = size*1024;
     }
         buf[1] = (char)(size);
         *msgsize = size*1024;
     }


@@ -334,7 +333,7 @@ Client::CreateBuffer(int* msgsize)
         //returned buffer will contain test indicator, message size in kb and data
         bufsize = (*msgsize)+2;
         buf = new char[bufsize];
         //returned buffer will contain test indicator, message size in kb and data
         bufsize = (*msgsize)+2;
         buf = new char[bufsize];

-        buf[0] = 0xBE; //second byte contains size in bytes
+        buf[0] = (unsigned char)0xBE; //second byte contains size in bytes

         buf[1] = (char)(*msgsize);
     }
     return buf;
         buf[1] = (char)(*msgsize);
     }
     return buf;


@@ -368,7 +367,7 @@ Client::StartWorker(workMode pMode) {
 
 void
 Client::StartWorker(workMode pMode, const wxString& pMessage) {
 
 void
 Client::StartWorker(workMode pMode, const wxString& pMessage) {

-    char* tmpbuf = strdup(pMessage.mb_str());
+    char* tmpbuf = wxStrdup(pMessage.mb_str());

     int msgsize = strlen(tmpbuf);
     char* buf = CreateBuffer(&msgsize);
     memset(buf+2,0x0,msgsize);
     int msgsize = strlen(tmpbuf);
     char* buf = CreateBuffer(&msgsize);
     memset(buf+2,0x0,msgsize);


@@ -614,7 +613,9 @@ EventWorker::OnSocketEvent(wxSocketEvent& pEvent) {
             //wxLogMessage(wxT("EventWorker: got connection"));
             wxLogMessage(wxT("%s: starting writing message (2 bytes for signature and %d bytes of data to write)"),CreateIdent(m_localaddr).c_str(),m_outsize-2);
             if (!m_clientSocket->GetLocal(m_localaddr))
             //wxLogMessage(wxT("EventWorker: got connection"));
             wxLogMessage(wxT("%s: starting writing message (2 bytes for signature and %d bytes of data to write)"),CreateIdent(m_localaddr).c_str(),m_outsize-2);
             if (!m_clientSocket->GetLocal(m_localaddr))

+            {

                 wxLogError(_("Cannot get peer data for socket %p"),m_clientSocket);
                 wxLogError(_("Cannot get peer data for socket %p"),m_clientSocket);

+            }

             m_currentType = WorkerEvent::SENDING;
             wxLogDebug(wxT("%s: CONNECTING"),CreateIdent(m_localaddr).c_str());
             SendEvent(false);
             m_currentType = WorkerEvent::SENDING;
             wxLogDebug(wxT("%s: CONNECTING"),CreateIdent(m_localaddr).c_str());
             SendEvent(false);