From c80599533f36a899a74ae02a4166a85a64bf7934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Tue, 10 May 2005 19:22:06 +0000
Subject: [PATCH] Compensate the usage of selecting already selected menu items
 by explicit 'New game' menu entry.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 demos/bombs/bombs.cpp  | 24 +++++++++++++++---------
 demos/bombs/bombs.h    | 11 ++++++-----
 demos/bombs/bombs1.cpp |  2 +-
 demos/bombs/game.cpp   |  2 +-
 demos/bombs/game.h     |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index f1d0883bb8..4501d80832 100644
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -2,7 +2,7 @@
 // Name:        bombs.cpp
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
@@ -61,9 +61,10 @@ bool BombsApp::OnInit()
 }
 
 BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
-    EVT_MENU(bombsID_EASY,       BombsFrame::OnNewEasyGame)
-    EVT_MENU(bombsID_MEDIUM,     BombsFrame::OnNewMediumGame)
-    EVT_MENU(bombsID_HARD,       BombsFrame::OnNewHardGame)
+    EVT_MENU(wxID_NEW,           BombsFrame::OnNewGame)
+    EVT_MENU(bombsID_EASY,       BombsFrame::OnEasyGame)
+    EVT_MENU(bombsID_MEDIUM,     BombsFrame::OnMediumGame)
+    EVT_MENU(bombsID_HARD,       BombsFrame::OnHardGame)
     EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner)
     EVT_MENU(wxID_EXIT,          BombsFrame::OnExit)
     EVT_MENU(wxID_ABOUT,         BombsFrame::OnAbout)
@@ -91,8 +92,8 @@ BombsFrame::BombsFrame(BombsGame *game)
     menuLevel->AppendRadioItem(bombsID_MEDIUM, wxT("&Medium (15x15)\tCtrl-2"));
     menuLevel->AppendRadioItem(bombsID_HARD, wxT("&Hard (25x20)\tCtrl-3"));
 
-    menuFile->Append(bombsID_NEWGAME, wxT("&New Game"),
-        menuLevel, wxT("Starts a new game"));
+    menuFile->Append(wxID_NEW, wxT("&New game\tCtrl-N"));
+    menuFile->Append(bombsID_LEVEL, wxT("&Level"),menuLevel, wxT("Starts a new game"));
     menuFile->AppendCheckItem(bombsID_EASYCORNER, wxT("&Easy corner"));
 
     menuFile->AppendSeparator();
@@ -177,17 +178,22 @@ void BombsFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
         wxT("About wxBombs") );
 }
 
-void BombsFrame::OnNewEasyGame(wxCommandEvent& WXUNUSED(event))
+void BombsFrame::OnNewGame(wxCommandEvent& WXUNUSED(event))
+{
+    NewGame(m_lastLevel, true);
+}
+
+void BombsFrame::OnEasyGame(wxCommandEvent& WXUNUSED(event))
 {
     NewGame(bombsID_EASY, true);
 }
 
-void BombsFrame::OnNewMediumGame(wxCommandEvent& WXUNUSED(event))
+void BombsFrame::OnMediumGame(wxCommandEvent& WXUNUSED(event))
 {
     NewGame(bombsID_MEDIUM, true);
 }
 
-void BombsFrame::OnNewHardGame(wxCommandEvent& WXUNUSED(event))
+void BombsFrame::OnHardGame(wxCommandEvent& WXUNUSED(event))
 {
     NewGame(bombsID_HARD, true);
 }
diff --git a/demos/bombs/bombs.h b/demos/bombs/bombs.h
index dbe4a30725..c7b511633d 100644
--- a/demos/bombs/bombs.h
+++ b/demos/bombs/bombs.h
@@ -2,7 +2,7 @@
 // Name:        bombs.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
@@ -45,9 +45,10 @@ public:
 
 private:
 
-    void OnNewEasyGame(wxCommandEvent& event);
-    void OnNewMediumGame(wxCommandEvent& event);
-    void OnNewHardGame(wxCommandEvent& event);
+    void OnNewGame(wxCommandEvent& event);
+    void OnEasyGame(wxCommandEvent& event);
+    void OnMediumGame(wxCommandEvent& event);
+    void OnHardGame(wxCommandEvent& event);
 
     void OnEasyCorner(wxCommandEvent& event);
 
@@ -68,7 +69,7 @@ private:
 // App specific menu identifiers
 enum
 {
-    bombsID_NEWGAME = wxID_HIGHEST,
+    bombsID_LEVEL = wxID_HIGHEST,
     bombsID_EASY,
     bombsID_MEDIUM,
     bombsID_HARD,
diff --git a/demos/bombs/bombs1.cpp b/demos/bombs/bombs1.cpp
index e6daa25607..a7724d1d24 100644
--- a/demos/bombs/bombs1.cpp
+++ b/demos/bombs/bombs1.cpp
@@ -2,7 +2,7 @@
 // Name:        bombs1.cpp
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
diff --git a/demos/bombs/game.cpp b/demos/bombs/game.cpp
index eed0dc622c..6a76fea09b 100644
--- a/demos/bombs/game.cpp
+++ b/demos/bombs/game.cpp
@@ -2,7 +2,7 @@
 // Name:        bombs1.cpp
 // Purpose:     Implementation of the class BombsGame
 // Author:      P. Foggia 1996
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
diff --git a/demos/bombs/game.h b/demos/bombs/game.h
index 636d024e8e..d32f597855 100644
--- a/demos/bombs/game.h
+++ b/demos/bombs/game.h
@@ -2,7 +2,7 @@
 // Name:        game.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia