Removed lots of OnClose functions; doc'ed OnCloseWindow better;

MM_... -> wxMM_...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/forty/scoredg.cpp

@@ -137,6 +137,9 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 	}
 }
 
+BEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
+    EVT_CLOSE(ScoreDialog::OnCloseWindow)
+END_EVENT_TABLE()
 
 ScoreDialog::ScoreDialog(
 							wxWindow* parent,
@@ -183,10 +186,7 @@ void ScoreDialog::Display()
 	Show(TRUE);
 }
 
-bool ScoreDialog::OnClose()
+void ScoreDialog::OnCloseWindow(wxCloseEvent& event)
 {
-	// hide the dialog
-	// NB don't return TRUE otherwise delete is called
-	Show(FALSE);
-	return FALSE;
+    EndModal(wxID_OK);
 }