fixed bug in generation of thumb scroll events

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index a44f0925c54be6010b838ef461a219f2e1047c43..b3ddb96def0cf9f28329ae92e97dc4a91f5b0cef 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -41,7 +41,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #  include "mondrian.xpm"
 #endif
 
 #  include "mondrian.xpm"
 #endif
 


@@ -216,8 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-  wxMessageBox(_("wxSocket demo: Server\n"
-                 "(c) 1999 Guillermo Rodriguez Garcia\n"),
+  wxMessageBox(_("wxSocket demo: Server\n(c) 1999 Guillermo Rodriguez Garcia\n"),

                _("About Server"),
                wxOK | wxICON_INFORMATION, this);
 }
                _("About Server"),
                wxOK | wxICON_INFORMATION, this);
 }


@@ -257,7 +256,7 @@ void MyFrame::Test2(wxSocketBase *sock)
 #define MAX_MSG_SIZE 10000
 
   wxString s;
 #define MAX_MSG_SIZE 10000
 
   wxString s;

-  char *buf = new char[MAX_MSG_SIZE];
+  wxChar *buf = new wxChar[MAX_MSG_SIZE];

   wxUint32 len;
 
   m_text->AppendText(_("Test 2 begins\n"));
   wxUint32 len;
 
   m_text->AppendText(_("Test 2 begins\n"));


@@ -266,7 +265,7 @@ void MyFrame::Test2(wxSocketBase *sock)
   // are not affected by them anyway.
 
   // Read the message
   // are not affected by them anyway.
 
   // Read the message

-  len = sock->ReadMsg(buf, MAX_MSG_SIZE).LastCount();
+  len = sock->ReadMsg(buf, MAX_MSG_SIZE * sizeof(wxChar)).LastCount();

   s.Printf(_("Client says: %s\n"), buf);
   m_text->AppendText(s);
   m_text->AppendText(_("Sending the data back\n"));
   s.Printf(_("Client says: %s\n"), buf);
   m_text->AppendText(s);
   m_text->AppendText(_("Sending the data back\n"));