X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..17b1d76b4add82305463d10b9f65668d06169363:/samples/sockets/client.cpp?ds=sidebyside diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index e450f4fd9d..eebb8a06d7 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -17,11 +17,6 @@ // headers // -------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) -# pragma implementation "client.cpp" -# pragma interface "client.cpp" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -29,7 +24,7 @@ # pragma hdrstop #endif -// for all others, include the necessary headers +// for all others, include the necessary headers #ifndef WX_PRECOMP # include "wx/wx.h" #endif @@ -76,8 +71,10 @@ public: void OnTest3(wxCommandEvent& event); void OnCloseConnection(wxCommandEvent& event); +#if wxUSE_URL // event handlers for Protocols menu void OnTestURL(wxCommandEvent& event); +#endif // event handlers for DatagramSocket menu (stub) void OnDatagram(wxCommandEvent& event); @@ -110,14 +107,16 @@ private: enum { // menu items - CLIENT_QUIT = 1000, - CLIENT_ABOUT, - CLIENT_OPEN, + CLIENT_QUIT = wxID_EXIT, + CLIENT_ABOUT = wxID_ABOUT, + CLIENT_OPEN = 100, CLIENT_TEST1, CLIENT_TEST2, CLIENT_TEST3, CLIENT_CLOSE, +#if wxUSE_URL CLIENT_TESTURL, +#endif CLIENT_DGRAM, // id for socket @@ -137,7 +136,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CLIENT_TEST3, MyFrame::OnTest3) EVT_MENU(CLIENT_CLOSE, MyFrame::OnCloseConnection) EVT_MENU(CLIENT_DGRAM, MyFrame::OnDatagram) +#if wxUSE_URL EVT_MENU(CLIENT_TESTURL, MyFrame::OnTestURL) +#endif EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent) END_EVENT_TABLE() @@ -157,11 +158,11 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(); // Show it and tell the application that it's our main window - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); // success - return TRUE; + return true; } // -------------------------------------------------------------------------- @@ -169,7 +170,7 @@ bool MyApp::OnInit() // -------------------------------------------------------------------------- // frame constructor -MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, +MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY, _("wxSocket demo: Client"), wxDefaultPosition, wxSize(300, 200)) { @@ -194,22 +195,28 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, m_menuDatagramSocket = new wxMenu(); m_menuDatagramSocket->Append(CLIENT_DGRAM, _("Send Datagram"), _("Test UDP sockets")); +#if wxUSE_URL m_menuProtocols = new wxMenu(); m_menuProtocols->Append(CLIENT_TESTURL, _("Test URL"), _("Get data from the specified URL")); +#endif // Append menus to the menubar m_menuBar = new wxMenuBar(); m_menuBar->Append(m_menuFile, _("&File")); m_menuBar->Append(m_menuSocket, _("&SocketClient")); m_menuBar->Append(m_menuDatagramSocket, _("&DatagramSocket")); +#if wxUSE_URL m_menuBar->Append(m_menuProtocols, _("&Protocols")); +#endif SetMenuBar(m_menuBar); +#if wxUSE_STATUSBAR // Status bar CreateStatusBar(2); +#endif // wxUSE_STATUSBAR // Make a textctrl for logging - m_text = new wxTextCtrl(this, -1, + m_text = new wxTextCtrl(this, wxID_ANY, _("Welcome to wxSocket demo: Client\nClient ready\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); @@ -222,9 +229,9 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, -1, m_sock->SetNotify(wxSOCKET_CONNECTION_FLAG | wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); - m_sock->Notify(TRUE); + m_sock->Notify(true); - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -238,8 +245,8 @@ MyFrame::~MyFrame() void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -253,8 +260,8 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) { wxIPV4address addr; - m_menuSocket->Enable(CLIENT_OPEN, FALSE); - m_menuSocket->Enable(CLIENT_CLOSE, FALSE); + m_menuSocket->Enable(CLIENT_OPEN, false); + m_menuSocket->Enable(CLIENT_CLOSE, false); // Ask user for server address wxString hostname = wxGetTextFromUser( @@ -271,21 +278,21 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) // There are two ways to use Connect(): blocking and non-blocking, // depending on the value passed as the 'wait' (2nd) parameter. // - // Connect(addr, TRUE) will wait until the connection completes, - // returning TRUE on success and FALSE on failure. This call blocks + // Connect(addr, true) will wait until the connection completes, + // returning true on success and false on failure. This call blocks // the GUI (this might be changed in future releases to honour the // wxSOCKET_BLOCK flag). // - // Connect(addr, FALSE) will issue a nonblocking connection request - // and return immediately. If the return value is TRUE, then the - // connection has been already succesfully established. If it is - // FALSE, you must wait for the request to complete, either with + // Connect(addr, false) will issue a nonblocking connection request + // and return immediately. If the return value is true, then the + // connection has been already successfully established. If it is + // false, you must wait for the request to complete, either with // WaitOnConnect() or by watching wxSOCKET_CONNECTION / LOST // events (please read the documentation). // // WaitOnConnect() itself never blocks the GUI (this might change // in the future to honour the wxSOCKET_BLOCK flag). This call will - // return FALSE on timeout, or TRUE if the connection request + // return false on timeout, or true if the connection request // completes, which in turn might mean: // // a) That the connection was successfully established @@ -298,24 +305,24 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) // // For blocking Connect: // - // bool success = client->Connect(addr, TRUE); + // bool success = client->Connect(addr, true); // // For nonblocking Connect: // - // client->Connect(addr, FALSE); + // client->Connect(addr, false); // - // bool waitmore = TRUE; + // bool waitmore = true; // while (! client->WaitOnConnect(seconds, millis) && waitmore ) // { // // possibly give some feedback to the user, // // update waitmore if needed. // } // bool success = client->IsConnected(); - // + // // And that's all :-) m_text->AppendText(_("\nTrying to connect (timeout = 10 sec) ...\n")); - m_sock->Connect(addr, FALSE); + m_sock->Connect(addr, false); m_sock->WaitOnConnect(10); if (m_sock->IsConnected()) @@ -326,7 +333,7 @@ void MyFrame::OnOpenConnection(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("Failed ! Unable to connect\n")); wxMessageBox(_("Can't connect to the specified host"), _("Alert !")); } - + UpdateStatusBar(); } @@ -337,7 +344,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) unsigned char len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 1 begins ===\n")); @@ -361,7 +368,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_sock->SetFlags(wxSOCKET_WAITALL); buf1 = _("Test string (less than 256 chars!)"); - len = (wxStrlen(buf1) + 1) * sizeof(wxChar); + len = (unsigned char)((wxStrlen(buf1) + 1) * sizeof(wxChar)); buf2 = new wxChar[wxStrlen(buf1) + 1]; m_text->AppendText(_("Sending a test buffer to the server ...")); @@ -387,7 +394,7 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 1 ends ===\n")); delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -398,7 +405,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) size_t len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 2 begins ===\n")); @@ -441,7 +448,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("Comparing the two buffers ...")); if (memcmp(msg1, msg2, len) != 0) { - m_text->AppendText(_("failed!\n")); + m_text->AppendText(_("failed!\n")); m_text->AppendText(_("Test 2 failed !\n")); } else @@ -456,7 +463,7 @@ void MyFrame::OnTest2(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 2 ends ===\n")); delete[] msg2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -467,7 +474,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) unsigned char len; // Disable socket menu entries (exception: Close Session) - m_busy = TRUE; + m_busy = true; UpdateStatusBar(); m_text->AppendText(_("\n=== Test 3 begins ===\n")); @@ -514,7 +521,7 @@ void MyFrame::OnTest3(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Test 3 ends ===\n")); delete[] buf2; - m_busy = FALSE; + m_busy = false; UpdateStatusBar(); } @@ -531,6 +538,8 @@ void MyFrame::OnDatagram(wxCommandEvent& WXUNUSED(event)) m_text->AppendText(_("=== Datagram test ends ===\n")); } +#if wxUSE_URL + void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) { // Note that we are creating a new socket here, so this @@ -571,7 +580,7 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) wxYield(); // Get the data - wxFile fileTest(wxT("test.url")); + wxFile fileTest(wxT("test.url"), wxFile::write); wxFileOutputStream sout(fileTest); if (!sout.Ok()) { @@ -588,6 +597,8 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event)) delete data; } +#endif + void MyFrame::OnSocketEvent(wxSocketEvent& event) { wxString s = _("OnSocketEvent: "); @@ -622,7 +633,9 @@ void MyFrame::UpdateStatusBar() s.Printf(_("%s : %d"), (addr.Hostname()).c_str(), addr.Service()); } +#if wxUSE_STATUSBAR SetStatusText(s, 1); +#endif // wxUSE_STATUSBAR m_menuSocket->Enable(CLIENT_OPEN, !m_sock->IsConnected() && !m_busy); m_menuSocket->Enable(CLIENT_TEST1, m_sock->IsConnected() && !m_busy);