X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..c4e2838090992384911a6a6aa44cac985d79a555:/samples/ipc/server.cpp diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp index 92b727abb5..562f9bb9f2 100644 --- a/samples/ipc/server.cpp +++ b/samples/ipc/server.cpp @@ -32,7 +32,7 @@ // 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 @@ -57,7 +57,6 @@ END_EVENT_TABLE() // global variables // ---------------------------------------------------------------------------- -char ipc_buffer[4000]; MyConnection *the_connection = NULL; // ============================================================================ @@ -71,10 +70,10 @@ MyConnection *the_connection = NULL; bool MyApp::OnInit() { // Create the main frame window - (new MyFrame(NULL, "Server"))->Show(TRUE); + (new MyFrame(NULL, _T("Server")))->Show(true); // service name (DDE classes) or port number (TCP/IP based classes) - wxString service = "4242"; + wxString service = IPC_SERVICE; if (argc > 1) service = argv[1]; @@ -83,7 +82,7 @@ bool MyApp::OnInit() m_server = new MyServer; m_server->Create(service); - return TRUE; + return true; } int MyApp::OnExit() @@ -99,11 +98,11 @@ int MyApp::OnExit() // Define my frame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title) - : wxFrame(frame, -1, title) + : wxFrame(frame, wxID_ANY, title, wxDefaultPosition, wxSize(350, 250)) { - panel = NULL; - +#if wxUSE_STATUSBAR CreateStatusBar(); +#endif // wxUSE_STATUSBAR // Give it an icon SetIcon(wxICON(mondrian)); @@ -111,45 +110,44 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(SERVER_EXIT, "&Exit"); + file_menu->Append(SERVER_EXIT, _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); - wxListBox *list = new wxListBox(panel, SERVER_LISTBOX, wxPoint(5, 5)); - list->Append("Apple"); - list->Append("Pear"); - list->Append("Orange"); - list->Append("Banana"); - list->Append("Fruit"); - - panel->Fit(); - Fit(); + // Make a listbox + wxListBox *list = new wxListBox(this, SERVER_LISTBOX); + list->Append(_T("Apple")); + list->Append(_T("Pear")); + list->Append(_T("Orange")); + list->Append(_T("Banana")); + list->Append(_T("Fruit")); } // Set the client process's listbox to this item void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event)) { - wxListBox* listBox = (wxListBox*) panel->FindWindow(SERVER_LISTBOX); + wxListBox* listBox = (wxListBox*) FindWindow(SERVER_LISTBOX); if (listBox) { wxString value = listBox->GetStringSelection(); + + /* Because the_connection only holds one connection, in this sample only + one connection can receive advise messages */ if (the_connection) { - the_connection->Advise("Item", (wxChar *)value.c_str()); + the_connection->Advise(IPC_ADVISE_NAME, (wxChar*)value.c_str()); } } } void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } // ---------------------------------------------------------------------------- @@ -159,15 +157,23 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) IPCDialogBox::IPCDialogBox(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size, MyConnection *connection) - : wxDialog(parent, -1, title, pos, size) + : wxDialog(parent, wxID_ANY, title, pos, size) { m_connection = connection; - (void)new wxButton(this, SERVER_QUIT_BUTTON, "Quit this connection", + (void)new wxButton(this, SERVER_QUIT_BUTTON, _T("Quit this connection"), wxPoint(5, 5)); Fit(); } -void IPCDialogBox::OnQuit(wxCommandEvent& event) +IPCDialogBox::~IPCDialogBox( ) +{ + // wxWidgets exit code destroys dialog before destroying the connection in + // OnExit, so make sure connection won't try to delete the dialog later. + if (m_connection) + m_connection->dialog = NULL; +} + +void IPCDialogBox::OnQuit(wxCommandEvent& WXUNUSED(event)) { m_connection->Disconnect(); delete m_connection; @@ -179,22 +185,23 @@ void IPCDialogBox::OnQuit(wxCommandEvent& event) wxConnectionBase *MyServer::OnAcceptConnection(const wxString& topic) { - if (strcmp(topic, "STDIO") != 0 && strcmp(topic, "IPC TEST") == 0) - return new MyConnection(ipc_buffer, WXSIZEOF(ipc_buffer)); - else - return NULL; + if ( topic == IPC_TOPIC ) + return new MyConnection(); + + // unknown topic + return NULL; } // ---------------------------------------------------------------------------- // MyConnection // ---------------------------------------------------------------------------- -MyConnection::MyConnection(char *buf, int size) - : wxConnection(buf, size) +MyConnection::MyConnection() + : wxConnection() { - dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), "Connection", - wxPoint(100, 100), wxSize(500, 500), this); - dialog->Show(TRUE); + dialog = new IPCDialogBox(wxTheApp->GetTopWindow(), _T("Connection"), + wxDefaultPosition, wxDefaultSize, this); + dialog->Show(true); the_connection = this; } @@ -202,41 +209,45 @@ MyConnection::~MyConnection() { if (the_connection) { - dialog->Destroy(); + if (dialog) + { + dialog->m_connection = NULL; + dialog->Destroy(); + } the_connection = NULL; } } bool MyConnection::OnExecute(const wxString& WXUNUSED(topic), - char *data, + wxChar *data, int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { - wxLogStatus("Execute command: %s", data); - return TRUE; + wxLogStatus(wxT("Execute command: %s"), data); + return true; } bool MyConnection::OnPoke(const wxString& WXUNUSED(topic), const wxString& item, - char *data, + wxChar *data, int WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { - wxLogStatus("Poke command: %s = %s", item.c_str(), data); - return TRUE; + wxLogStatus(wxT("Poke command: %s = %s"), item.c_str(), data); + return true; } -char *MyConnection::OnRequest(const wxString& WXUNUSED(topic), +wxChar *MyConnection::OnRequest(const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), int * WXUNUSED(size), wxIPCFormat WXUNUSED(format)) { - return "Here, have your data, client!"; + return _T("Here, have your data, client!"); } bool MyConnection::OnStartAdvise(const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item)) { - return TRUE; + return true; }