don't generate an endless stream of asserts for the 0-sized images

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 9807468ec77dec6e2903f5b5a1d643d104d3d35f..b3ddb96def0cf9f28329ae92e97dc4a91f5b0cef 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -29,7 +29,7 @@
 #  pragma hdrstop
 #endif
 
 #  pragma hdrstop
 #endif
 

-// for all others, include the necessary headers 
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
 #  include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #  include "wx/wx.h"
 #endif


@@ -41,7 +41,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#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"));


@@ -287,7 +286,7 @@ void MyFrame::Test3(wxSocketBase *sock)
 
   m_text->AppendText(_("Test 3 begins\n"));
 
 
   m_text->AppendText(_("Test 3 begins\n"));
 

-  // This test is similar to the first one, but the len is   
+  // This test is similar to the first one, but the len is

   // expressed in kbytes - this tests large data transfers.
 
   sock->SetFlags(wxSOCKET_WAITALL);
   // expressed in kbytes - this tests large data transfers.
 
   sock->SetFlags(wxSOCKET_WAITALL);


@@ -347,15 +346,15 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {
 
 void MyFrame::OnSocketEvent(wxSocketEvent& event)
 {

-  wxSocketBase *sock = event.GetSocket();

   wxString s = _("OnSocketEvent: ");
   wxString s = _("OnSocketEvent: ");

+  wxSocketBase *sock = event.GetSocket();

 
 

-  // We first print a msg
+  // First, print a message

   switch(event.GetSocketEvent())
   {
   switch(event.GetSocketEvent())
   {

-    case wxSOCKET_INPUT: s.Append(_("wxSOCKET_INPUT\n")); break;
-    case wxSOCKET_LOST:  s.Append(_("wxSOCKET_LOST\n")); break;
-    default:             s.Append(_("unexpected event !\n"));
+    case wxSOCKET_INPUT : s.Append(_("wxSOCKET_INPUT\n")); break;
+    case wxSOCKET_LOST  : s.Append(_("wxSOCKET_LOST\n")); break;
+    default             : s.Append(_("Unexpected event !\n")); break;

   }
 
   m_text->AppendText(s);
   }
 
   m_text->AppendText(s);


@@ -371,14 +370,15 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
       // Which test are we going to run?
       unsigned char c;
 
       // Which test are we going to run?
       unsigned char c;

-      sock->Read(&c ,1);
+      sock->Read(&c, 1);

 
       switch (c)
       {
         case 0xBE: Test1(sock); break;
         case 0xCE: Test2(sock); break;
         case 0xDE: Test3(sock); break;
 
       switch (c)
       {
         case 0xBE: Test1(sock); break;
         case 0xCE: Test2(sock); break;
         case 0xDE: Test3(sock); break;

-        default: s.Append(_("Unknown test id received from client\n\n"));
+        default:
+          m_text->AppendText(_("Unknown test id received from client\n\n"));

       }
 
       // Enable input events again.
       }
 
       // Enable input events again.