diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index ea43bda9a6..92b727abb5 100644
--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@@ -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()
 
@@ -110,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;
 
@@ -133,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)
@@ -146,6 +147,11 @@ void MyFrame::OnListBoxClick(wxCommandEvent& event)
     }
 }
 
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(TRUE);
+}
+
 // ----------------------------------------------------------------------------
 // IPCDialogBox
 // ----------------------------------------------------------------------------
diff --git a/samples/ipc/server.h b/samples/ipc/server.h
index 03b358b1f4..ac85cd4b0d 100644
--- a/samples/ipc/server.h
+++ b/samples/ipc/server.h
@@ -30,6 +30,7 @@ public:
     MyFrame(wxFrame *frame, const wxString& title);
 
     void OnListBoxClick(wxCommandEvent& event);
+    void OnExit(wxCommandEvent& event);
 
 private:
     wxPanel *panel;
@@ -76,6 +77,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#define SERVER_QUIT         wxID_EXIT
+#define SERVER_EXIT         wxID_EXIT
 #define SERVER_LISTBOX      500
 #define SERVER_QUIT_BUTTON  501