only check for lib directory for architectures which have multiple ABIs (Solaris...

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

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index b90dc2643c5259895ee85a1a562ecc982d06ebbb..548ad955b699eec263e9a1831734d5534f8e2f35 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -18,8 +18,8 @@
 // --------------------------------------------------------------------------
 
 #if defined(__GNUG__) && !defined(__APPLE__)
 // --------------------------------------------------------------------------
 
 #if defined(__GNUG__) && !defined(__APPLE__)

-#  pragma implementation "server.cpp"
-#  pragma interface "server.cpp"
+    #pragma implementation
+    #pragma interface

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -96,11 +96,11 @@ private:
 enum
 {
   // menu items
 enum
 {
   // menu items

-  SERVER_QUIT = 1000,
-  SERVER_ABOUT,
+  SERVER_QUIT = wxID_EXIT,
+  SERVER_ABOUT = wxID_ABOUT,

 
   // id for sockets
 
   // id for sockets

-  SERVER_ID,
+  SERVER_ID = 100,

   SOCKET_ID
 };
 
   SOCKET_ID
 };
 


@@ -163,8 +163,10 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 
   m_menuBar->Append(m_menuFile, _("&File"));
   SetMenuBar(m_menuBar);
 

+#if wxUSE_STATUSBAR

   // Status bar
   CreateStatusBar(2);
   // Status bar
   CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,
 
   // Make a textctrl for logging
   m_text  = new wxTextCtrl(this, wxID_ANY,


@@ -412,7 +414,9 @@ void MyFrame::OnSocketEvent(wxSocketEvent& event)
 
 void MyFrame::UpdateStatusBar()
 {
 
 void MyFrame::UpdateStatusBar()
 {

+#if wxUSE_STATUSBAR

   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);
   wxString s;
   s.Printf(_("%d clients connected"), m_numClients);
   SetStatusText(s, 1);

+#endif // wxUSE_STATUSBAR

 }
 }