X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb43b372fb1567caf7ccfa523aca10c676ceaec4..a3c1786def55bcc233f9606acb1aceee956d184f:/samples/forty/playerdg.cpp

diff --git a/samples/forty/playerdg.cpp b/samples/forty/playerdg.cpp
index e55cd0f93d..fa3ea03d04 100644
--- a/samples/forty/playerdg.cpp
+++ b/samples/forty/playerdg.cpp
@@ -37,6 +37,7 @@ BEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
 	EVT_BUTTON(wxID_OK, PlayerSelectionDialog::ButtonCallback)
 	EVT_BUTTON(wxID_CANCEL, PlayerSelectionDialog::ButtonCallback)
 	EVT_LISTBOX(ID_LISTBOX, PlayerSelectionDialog::SelectCallback)
+    EVT_CLOSE(PlayerSelectionDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
 PlayerSelectionDialog::PlayerSelectionDialog(
@@ -142,22 +143,17 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 	return m_player;
 }
 
-bool PlayerSelectionDialog::OnClose()
+void PlayerSelectionDialog::OnCloseWindow(wxCloseEvent& event)
 {
-	// hide the dialog
-	// NB don't return TRUE otherwise delete is called
 	m_player = "";
-	Show(FALSE);
-	return FALSE;
+    EndModal(wxID_CANCEL);
 }
 
 void PlayerSelectionDialog::SelectCallback(wxCommandEvent& event)
 {
 	if (event.GetEventType() == wxEVT_COMMAND_LISTBOX_SELECTED)
 	{
-#ifdef __WXGTK__
-		if (event.IsSelection())
-#endif
+//	    if (event.IsSelection())
 		m_textField->SetValue(event.GetString());
 	}
 }
@@ -176,17 +172,17 @@ void PlayerSelectionDialog::ButtonCallback(wxCommandEvent& event)
 			else
 			{
 				m_player = name;
-				Show(FALSE);
+				EndModal(wxID_OK);
 			}
 		}
 		else
 		{
-			wxMessageBox("Please enter your name", "Forty Thieves");
+ 			wxMessageBox("Please enter your name", "Forty Thieves");
 		}
 	}
 	else
 	{
 		m_player = "";
-		Show(FALSE);
+		EndModal(wxID_CANCEL);
 	}
 }