merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -45,6 +45,7 @@
 | 
			
		||||
IMPLEMENT_APP(MyApp)
 | 
			
		||||
 | 
			
		||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 | 
			
		||||
    EVT_MENU   (SERVER_EXIT, MyFrame::OnExit)
 | 
			
		||||
    EVT_LISTBOX(SERVER_LISTBOX, MyFrame::OnListBoxClick)
 | 
			
		||||
END_EVENT_TABLE()
 | 
			
		||||
 | 
			
		||||
@@ -72,14 +73,15 @@ bool MyApp::OnInit()
 | 
			
		||||
    // Create the main frame window
 | 
			
		||||
    (new MyFrame(NULL, "Server"))->Show(TRUE);
 | 
			
		||||
 | 
			
		||||
    // create the server object
 | 
			
		||||
    wxString server_name = "4242";
 | 
			
		||||
    // service name (DDE classes) or port number (TCP/IP based classes)
 | 
			
		||||
    wxString service = "4242";
 | 
			
		||||
 | 
			
		||||
    if (argc > 1)
 | 
			
		||||
        server_name = argv[1];
 | 
			
		||||
        service = argv[1];
 | 
			
		||||
 | 
			
		||||
    // Create a new server
 | 
			
		||||
    m_server = new MyServer;
 | 
			
		||||
    m_server->Create(server_name);
 | 
			
		||||
    m_server->Create(service);
 | 
			
		||||
 | 
			
		||||
    return TRUE;
 | 
			
		||||
}
 | 
			
		||||
@@ -109,7 +111,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
 | 
			
		||||
    // Make a menubar
 | 
			
		||||
    wxMenu *file_menu = new wxMenu;
 | 
			
		||||
 | 
			
		||||
    file_menu->Append(SERVER_QUIT, "&Exit");
 | 
			
		||||
    file_menu->Append(SERVER_EXIT, "&Exit");
 | 
			
		||||
 | 
			
		||||
    wxMenuBar *menu_bar = new wxMenuBar;
 | 
			
		||||
 | 
			
		||||
@@ -132,7 +134,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Set the client process's listbox to this item
 | 
			
		||||
void MyFrame::OnListBoxClick(wxCommandEvent& event)
 | 
			
		||||
void MyFrame::OnListBoxClick(wxCommandEvent& WXUNUSED(event))
 | 
			
		||||
{
 | 
			
		||||
    wxListBox* listBox = (wxListBox*) panel->FindWindow(SERVER_LISTBOX);
 | 
			
		||||
    if (listBox)
 | 
			
		||||
@@ -145,6 +147,11 @@ void MyFrame::OnListBoxClick(wxCommandEvent& event)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 | 
			
		||||
{
 | 
			
		||||
    Close(TRUE);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// ----------------------------------------------------------------------------
 | 
			
		||||
// IPCDialogBox
 | 
			
		||||
// ----------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user