From: Vadim Zeitlin Date: Wed, 27 Mar 2002 19:00:49 +0000 (+0000) Subject: minor cosmetic fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/39d580f7dcc48a85d092f6088f8c978a18db5a97?ds=sidebyside minor cosmetic fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp index 6fedd6cea4..e5e9b105f4 100644 --- a/samples/ipc/client.cpp +++ b/samples/ipc/client.cpp @@ -137,39 +137,33 @@ int MyApp::OnExit() // Define my frame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title) - : wxFrame(frame, -1, title) + : wxFrame(frame, -1, 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, "&Execute\tCtrl-E"); + file_menu->Append(CLIENT_REQUEST, "&Request\tCtrl-R"); + file_menu->Append(CLIENT_POKE, "&Poke\tCtrl-P"); + file_menu->Append(CLIENT_QUIT, "&Quit\tCtrl-Q"); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "File"); + menu_bar->Append(file_menu, "&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)); + // Make a listbox which shows the choices made in the server + the_list = new wxListBox(this, 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(); } void MyFrame::OnExecute(wxCommandEvent& event) diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp index 3db49585e0..f278b704e8 100644 --- a/samples/ipc/server.cpp +++ b/samples/ipc/server.cpp @@ -99,10 +99,8 @@ int MyApp::OnExit() // Define my frame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title) - : wxFrame(frame, -1, title) + : wxFrame(frame, -1, title, wxDefaultPosition, wxSize(350, 250)) { - panel = NULL; - CreateStatusBar(); // Give it an icon @@ -111,7 +109,7 @@ 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, "&Quit\tCtrl-Q"); wxMenuBar *menu_bar = new wxMenuBar; @@ -120,23 +118,19 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title) // 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)); + // Make a listbox + wxListBox *list = new wxListBox(this, SERVER_LISTBOX, wxPoint(5, 5)); list->Append("Apple"); list->Append("Pear"); list->Append("Orange"); list->Append("Banana"); list->Append("Fruit"); - - panel->Fit(); - Fit(); } // 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();