Make a couple virtuals protected so they can be overridden.

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index a57137cbede9bad612b41333c6da95212dfccc37..04b4ce33f28d6bfe534c3205678a5fd5e92aae84 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -45,7 +45,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -187,7 +187,7 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   m_menuFile->Append(SERVER_WAITFORACCEPT, "&Wait for connection\tCtrl-W");
   m_menuFile->Append(SERVER_UDPTEST, "&UDP test\tCtrl-U");
   m_menuFile->AppendSeparator();
-  m_menuFile->Append(SERVER_ABOUT, _("&About...\tCtrl-A"), _("Show about dialog"));
+  m_menuFile->Append(SERVER_ABOUT, _("&About\tCtrl-A"), _("Show about dialog"));
   m_menuFile->AppendSeparator();
   m_menuFile->Append(SERVER_QUIT, _("E&xit\tAlt-X"), _("Quit server"));
 
@@ -217,8 +217,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   // Create the socket
   m_server = new wxSocketServer(addr);
 
-  // We use Ok() here to see if the server is really listening
-  if (! m_server->Ok())
+  // We use IsOk() here to see if the server is really listening
+  if (! m_server->IsOk())
   {
     wxLogMessage("Could not listen at the specified port !");
     return;