Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 4187191ceeca460067d005619ec8e3d5cd2e5cd9..853fb4b278d9b022cfddbe416a544768147134e5 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -162,9 +162,8 @@ bool MyApp::OnInit()
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 

-  // Show it and tell the application that it's our main window
+  // Show it

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

-  SetTopWindow(frame);

 
   // Success
   return true;
 
   // Success
   return true;


@@ -218,8 +217,8 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   // Create the socket
   m_server = new wxSocketServer(addr);
 
   // 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;
   {
     wxLogMessage("Could not listen at the specified port !");
     return;