X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7e19213511dee70a8ff168bdcf0e6e022139a56..1ee3fb3846ae47c5292128a6f0bd4c8e38d7ba31:/samples/ipc/client.cpp diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp index 4cabdc42cb..5bc4aeb62f 100644 --- a/samples/ipc/client.cpp +++ b/samples/ipc/client.cpp @@ -30,10 +30,9 @@ // Settings common to both executables: determines whether // we're using TCP/IP or real DDE. - #include "ddesetup.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif @@ -56,11 +55,10 @@ END_EVENT_TABLE() // globals // ---------------------------------------------------------------------------- -char ipc_buffer[4000]; wxListBox *the_list = NULL; MyConnection *the_connection = NULL; -MyClient *my_client ; +MyClient *my_client; // ============================================================================ // implementation @@ -74,11 +72,14 @@ MyClient *my_client ; // main frame bool MyApp::OnInit() { - wxString server = "4242"; - wxString hostName = wxGetHostName(); + // service name (DDE classes) or port number (TCP/IP based classes) + wxString service = IPC_SERVICE; + + // ignored under DDE, host name in TCP/IP based classes + wxString hostName = _T("localhost"); if (argc > 1) - server = argv[1]; + service = argv[1]; if (argc > 2) hostName = argv[2]; @@ -88,108 +89,104 @@ bool MyApp::OnInit() // suppress the log messages from MakeConnection() { wxLogNull nolog; - the_connection = (MyConnection *)my_client->MakeConnection(hostName, server, "IPC TEST"); + the_connection = (MyConnection *) + my_client->MakeConnection(hostName, service, IPC_TOPIC); while ( !the_connection ) { - if ( wxMessageBox("Failed to make connection to server.\nRetry?", - "Client Demo Error", + if ( wxMessageBox(_T("Failed to make connection to server.\nRetry?"), + _T("Client Demo Error"), wxICON_ERROR | wxYES_NO | wxCANCEL ) != wxYES ) { // no server - return FALSE; + return false; } - the_connection = (MyConnection *)my_client->MakeConnection(hostName, server, "IPC TEST"); + the_connection = (MyConnection *)my_client->MakeConnection(hostName, service, _T("IPC TEST")); } } - if (!the_connection->StartAdvise("Item")) - wxMessageBox("StartAdvise failed", "Client Demo Error"); + if (!the_connection->StartAdvise(IPC_ADVISE_NAME)) + wxMessageBox(_T("StartAdvise failed"), _T("Client Demo Error")); // Create the main frame window - (new MyFrame(NULL, "Client"))->Show(TRUE); + (new MyFrame(NULL, _T("Client")))->Show(true); - return TRUE; + return true; } int MyApp::OnExit() { - if (the_connection) - { - the_connection->Disconnect(); - } - // will delete the connection too + // Update: Seems it didn't delete the_connection, because there's a leak. + // Deletion is now explicitly done a few lines up. + // another Update: in fact it's because OnDisconnect should delete it, but + // it wasn't delete my_client; + + return 0; } // Define my frame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title) - : wxFrame(frame, -1, title) + : wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(300, 200)) { - panel = NULL; - // Give it an icon SetIcon(wxICON(mondrian)); // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(CLIENT_EXECUTE, "Execute"); - file_menu->Append(CLIENT_REQUEST, "Request"); - file_menu->Append(CLIENT_POKE, "Poke"); - file_menu->Append(CLIENT_QUIT, "Quit"); + file_menu->Append(CLIENT_EXECUTE, _T("&Execute\tCtrl-E")); + file_menu->Append(CLIENT_REQUEST, _T("&Request\tCtrl-R")); + file_menu->Append(CLIENT_POKE, _T("&Poke\tCtrl-P")); + file_menu->Append(CLIENT_QUIT, _T("&Quit\tCtrl-Q")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "File"); + menu_bar->Append(file_menu, _T("&File")); // Associate the menu bar with the frame SetMenuBar(menu_bar); - // Make a panel - panel = new wxPanel(this); - the_list = new wxListBox(panel, CLIENT_LISTBOX, wxPoint(5, 5)); - the_list->Append("Apple"); - the_list->Append("Pear"); - the_list->Append("Orange"); - the_list->Append("Banana"); - the_list->Append("Fruit"); - - panel->Fit(); - Fit(); + // Make a listbox which shows the choices made in the server + the_list = new wxListBox(this, CLIENT_LISTBOX, wxPoint(5, 5)); + the_list->Append(_T("Apple")); + the_list->Append(_T("Pear")); + the_list->Append(_T("Orange")); + the_list->Append(_T("Banana")); + the_list->Append(_T("Fruit")); } -void MyFrame::OnExecute(wxCommandEvent& event) +void MyFrame::OnExecute(wxCommandEvent& WXUNUSED(event)) { if (the_connection) - if (!the_connection->Execute("Hello from the client!")) - wxMessageBox("Execute failed", "Client Demo Error"); + if (!the_connection->Execute(_T("Hello from the client!"))) + wxMessageBox(_T("Execute failed"), _T("Client Demo Error")); } -void MyFrame::OnPoke(wxCommandEvent& event) +void MyFrame::OnPoke(wxCommandEvent& WXUNUSED(event)) { if (the_connection) - if (!the_connection->Poke("An item", "Some data to poke at the server!")) - wxMessageBox("Poke failed", "Client Demo Error"); + if (!the_connection->Poke(_T("An item"), _T("Some data to poke at the server!"))) + wxMessageBox(_T("Poke failed"), _T("Client Demo Error")); } -void MyFrame::OnRequest(wxCommandEvent& event) +void MyFrame::OnRequest(wxCommandEvent& WXUNUSED(event)) { if (the_connection) { - char *data = the_connection->Request("An item"); + wxChar *data = the_connection->Request(_T("An item")); if (data) - wxMessageBox(data, "Client: Request", wxOK); + wxMessageBox(data, _T("Client: Request"), wxOK); else - wxMessageBox("Request failed", "Client Demo Error"); + wxMessageBox(_T("Request failed"), _T("Client Demo Error")); } } -void MyFrame::OnExit(wxCommandEvent& event) +void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { Close(); } @@ -199,33 +196,26 @@ wxConnectionBase *MyClient::OnMakeConnection() return new MyConnection; } -MyConnection::MyConnection() - : wxConnection(ipc_buffer, WXSIZEOF(ipc_buffer)) -{ -} - -MyConnection::~MyConnection() -{ - the_connection = NULL; -} - -bool MyConnection::OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) +bool MyConnection::OnAdvise(const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *data, int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { if (the_list) { int n = the_list->FindString(data); - if (n > -1) + if (n > wxNOT_FOUND) the_list->SetSelection(n); } - return TRUE; + return true; } bool MyConnection::OnDisconnect() { + // when connection is terminated, quit whole program wxWindow *win = wxTheApp->GetTopWindow(); if ( win ) win->Destroy(); - return TRUE; + // delete self + the_connection = NULL; + return wxConnection::OnDisconnect(); }