X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b806b98241ab649c169aaa1f134df85e80fb8b..d0b6c0c52729e737a8d69a61a2f47c24abf18a8c:/samples/sockets/server.cpp diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index 853fb4b278..1f6835a0ae 100644 --- a/samples/sockets/server.cpp +++ b/samples/sockets/server.cpp @@ -3,7 +3,6 @@ // Purpose: Server for wxSocket demo // Author: Guillermo Rodriguez Garcia // Created: 1999/09/19 -// RCS-ID: $Id$ // Copyright: (c) 1999 Guillermo Rodriguez Garcia // (c) 2009 Vadim Zeitlin // Licence: wxWindows licence @@ -45,7 +44,7 @@ // -------------------------------------------------------------------------- // the application icon -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -187,7 +186,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"));