These at least compiles in Unicode mode...

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

diff --git a/samples/wxsocket/server.cpp b/samples/wxsocket/server.cpp
index d0e11583d2e9c0eea282ed5505168d36cb37eee8..8eefa8ca1ecb3c806d3969d4b12dbe56ec8ee9b9 100644 (file)
--- a/samples/wxsocket/server.cpp
+++ b/samples/wxsocket/server.cpp
@@ -1,12 +1,12 @@
 /*
  * File:       server.cpp
  * Purpose:    wxSocket: server demo
- * Author:     LAVAUX Guilhem (from minimal.cc)
+ * Author:     LAVAUX Guilhem
  * Created:    June 1997
  * Updated:    
- * Copyright:  (c) 1993, AIAI, University of Edinburgh
- *             (C) 1997, LAVAUX Guilhem
+ * Copyright: (C) 1997, LAVAUX Guilhem
  */
+
 #ifdef __GNUG__
 #pragma implementation
 #pragma interface
@@ -22,8 +22,13 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
+
 #include "wx/socket.h"
 
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
+#include "mondrian.xpm"
+#endif
+
 // Define a new application type
 class MyApp: public wxApp
 { public:
@@ -77,12 +82,7 @@ bool MyApp::OnInit(void)
   MyFrame *frame = new MyFrame(NULL);
 
   // Give it an icon
-#ifdef wx_msw
-  frame->SetIcon(new wxIcon("mondrian"));
-#endif
-#ifdef wx_x
-  frame->SetIcon(new wxIcon("aiai.xbm"));
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -104,7 +104,7 @@ bool MyApp::OnInit(void)
 
 void MySock::OldOnNotify(wxRequestEvent flags)
 {
-  extern wxList wxPendingDelete;
+  extern wxList WXDLLEXPORT wxPendingDelete;
 
   switch (flags) {
   case EVT_READ: