updated bakefiles to take advantage of Bakefile 0.2.3 (now required)

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index fab500e48d92043d97b10dac98550b76325810d8..cd8fe59d5bf86ac534ed0f025ee21d358a1a7c83 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -17,11 +17,6 @@
 // headers
 // --------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -41,9 +36,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#  include "mondrian.xpm"
-#endif
+#include "mondrian.xpm"
 
 // --------------------------------------------------------------------------
 // classes
@@ -96,11 +89,11 @@ 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
 };
 
@@ -128,6 +121,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
+  if ( !wxApp::OnInit() )
+      return false;
+
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
@@ -175,7 +171,11 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
                            wxTE_MULTILINE | wxTE_READONLY);
 
   // Create the address - defaults to localhost:0 initially
+#if wxUSE_IPV6
+  wxIPV6address addr;
+#else
   wxIPV4address addr;
+#endif
   addr.Service(3000);
 
   // Create the socket