fixed typo

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 9807468ec77dec6e2903f5b5a1d643d104d3d35f..4904c662fc829abee027d2d8e8069aa32e4f9e3f 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -17,7 +17,7 @@
 // headers
 // --------------------------------------------------------------------------
 
 // headers
 // --------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #  pragma implementation "server.cpp"
 #  pragma interface "server.cpp"
 #endif
 #  pragma implementation "server.cpp"
 #  pragma interface "server.cpp"
 #endif


@@ -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
 


@@ -84,7 +84,7 @@ private:
   bool            m_busy;
   int             m_numClients;
 
   bool            m_busy;
   int             m_numClients;
 

-  // any class wishing to process wxWindows events must use this macro
+  // any class wishing to process wxWidgets events must use this macro

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 


@@ -105,7 +105,7 @@ enum
 };
 
 // --------------------------------------------------------------------------
 };
 
 // --------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -132,11 +132,11 @@ bool MyApp::OnInit()
   MyFrame *frame = new MyFrame();
 
   // Show it and tell the application that it's our main window
   MyFrame *frame = new MyFrame();
 
   // Show it and tell the application that it's our main window

-  frame->Show(TRUE);
+  frame->Show(true);

   SetTopWindow(frame);
 
   // Success
   SetTopWindow(frame);
 
   // Success

-  return TRUE;
+  return true;

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -145,7 +145,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 
 
 // frame constructor
 

-MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,

                              _("wxSocket demo: Server"),
                              wxDefaultPosition, wxSize(300, 200))
 {
                              _("wxSocket demo: Server"),
                              wxDefaultPosition, wxSize(300, 200))
 {


@@ -163,11 +163,13 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 

+#if wxUSE_STATUSBAR

   // Status bar
   CreateStatusBar(2);
   // Status bar
   CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a textctrl for logging
 
   // Make a textctrl for logging

-  m_text  = new wxTextCtrl(this, -1,
+  m_text  = new wxTextCtrl(this, wxID_ANY,

                            _("Welcome to wxSocket demo: Server\n"),
                            wxDefaultPosition, wxDefaultSize,
                            wxTE_MULTILINE | wxTE_READONLY);
                            _("Welcome to wxSocket demo: Server\n"),
                            wxDefaultPosition, wxDefaultSize,
                            wxTE_MULTILINE | wxTE_READONLY);


@@ -193,9 +195,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   // Setup the event handler and subscribe to connection events
   m_server->SetEventHandler(*this, SERVER_ID);
   m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
   // Setup the event handler and subscribe to connection events
   m_server->SetEventHandler(*this, SERVER_ID);
   m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);

-  m_server->Notify(TRUE);
+  m_server->Notify(true);

 
 

-  m_busy = FALSE;
+  m_busy = false;

   m_numClients = 0;
   UpdateStatusBar();
 }
   m_numClients = 0;
   UpdateStatusBar();
 }


@@ -210,14 +212,13 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-  // TRUE is to force the frame to close
-  Close(TRUE);
+  // true is to force the frame to close
+  Close(true);

 }
 
 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 +258,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 +267,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 +288,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);


@@ -321,11 +322,11 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   m_text->AppendText(s);
 
   // Accept new connection if there is one in the pending
   m_text->AppendText(s);
 
   // Accept new connection if there is one in the pending

-  // connections queue, else exit. We use Accept(FALSE) for
+  // connections queue, else exit. We use Accept(false) for

   // non-blocking accept (although if we got here, there
   // should ALWAYS be a pending connection).
 
   // non-blocking accept (although if we got here, there
   // should ALWAYS be a pending connection).
 

-  sock = m_server->Accept(FALSE);
+  sock = m_server->Accept(false);

 
   if (sock)
   {
 
   if (sock)
   {


@@ -339,7 +340,7 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
   sock->SetEventHandler(*this, SOCKET_ID);
   sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
 
   sock->SetEventHandler(*this, SOCKET_ID);
   sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

-  sock->Notify(TRUE);
+  sock->Notify(true);

 
   m_numClients++;
   UpdateStatusBar();
 
   m_numClients++;
   UpdateStatusBar();


@@ -347,15 +348,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 +372,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.


@@ -412,7 +414,9 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
 void MyFrame::UpdateStatusBar()
 {
 
 void MyFrame::UpdateStatusBar()
 {

+#if wxUSE_STATUSBAR

   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);
   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);

+#endif // wxUSE_STATUSBAR

 }
 }