X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/677a9f0c613385e2e43d82ce0596ff3aa2abea6c..6e2717981772a139d3cd9e51d497b13792fe662d:/samples/sockets/server.cpp

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index a44f0925c5..2702c113c4 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -17,11 +17,6 @@
 // headers
 // --------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#  pragma implementation "server.cpp"
-#  pragma interface "server.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -41,7 +36,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #  include "mondrian.xpm"
 #endif
 
@@ -84,7 +79,7 @@ private:
   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()
 };
 
@@ -96,16 +91,16 @@ private:
 enum
 {
   // menu items
-  SERVER_QUIT = 1000,
-  SERVER_ABOUT,
+  SERVER_QUIT = wxID_EXIT,
+  SERVER_ABOUT = wxID_ABOUT,
 
   // id for sockets
-  SERVER_ID,
+  SERVER_ID = 100,
   SOCKET_ID
 };
 
 // --------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // --------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -132,11 +127,11 @@ bool MyApp::OnInit()
   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
-  return TRUE;
+  return true;
 }
 
 // --------------------------------------------------------------------------
@@ -145,7 +140,7 @@ bool MyApp::OnInit()
 
 // frame constructor
 
-MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
+MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                              _("wxSocket demo: Server"),
                              wxDefaultPosition, wxSize(300, 200))
 {
@@ -163,11 +158,13 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1,
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 
+#if wxUSE_STATUSBAR
   // Status bar
   CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
   // 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);
@@ -193,9 +190,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);
-  m_server->Notify(TRUE);
+  m_server->Notify(true);
 
-  m_busy = FALSE;
+  m_busy = false;
   m_numClients = 0;
   UpdateStatusBar();
 }
@@ -210,14 +207,13 @@ MyFrame::~MyFrame()
 
 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))
 {
-  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);
 }
@@ -257,7 +253,7 @@ void MyFrame::Test2(wxSocketBase *sock)
 #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"));
@@ -266,7 +262,7 @@ void MyFrame::Test2(wxSocketBase *sock)
   // 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"));
@@ -321,11 +317,11 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
   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).
 
-  sock = m_server->Accept(FALSE);
+  sock = m_server->Accept(false);
 
   if (sock)
   {
@@ -339,7 +335,7 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
 
   sock->SetEventHandler(*this, SOCKET_ID);
   sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
-  sock->Notify(TRUE);
+  sock->Notify(true);
 
   m_numClients++;
   UpdateStatusBar();
@@ -413,7 +409,9 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
 void MyFrame::UpdateStatusBar()
 {
+#if wxUSE_STATUSBAR
   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);
+#endif // wxUSE_STATUSBAR
 }