Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compensate the usage of selecting already selected menu items by explicit 'New game' menu entry.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-10 19:22:06 +00:00
parent 26c36d7505
commit c80599533f
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
demos/bombs/bombs.cpp
View File

@@ -2,7 +2,7 @@
// Name: bombs.cpp // Name: bombs.cpp
// Purpose: Bombs game // Purpose: Bombs game
// Author: P. Foggia 1996 // Author: P. Foggia 1996
// Modified by: Wlodzimierz Skiba (ABX) 2003 // Modified by: Wlodzimierz Skiba (ABX) since 2003
// Created: 1996 // Created: 1996
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1996 P. Foggia // Copyright: (c) 1996 P. Foggia
@@ -61,9 +61,10 @@ bool BombsApp::OnInit()
} }
BEGIN_EVENT_TABLE(BombsFrame, wxFrame) BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
EVT_MENU(bombsID_EASY, BombsFrame::OnNewEasyGame) EVT_MENU(wxID_NEW, BombsFrame::OnNewGame)
EVT_MENU(bombsID_MEDIUM, BombsFrame::OnNewMediumGame) EVT_MENU(bombsID_EASY, BombsFrame::OnEasyGame)
EVT_MENU(bombsID_HARD, BombsFrame::OnNewHardGame) EVT_MENU(bombsID_MEDIUM, BombsFrame::OnMediumGame)
EVT_MENU(bombsID_HARD, BombsFrame::OnHardGame)
EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner) EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner)
EVT_MENU(wxID_EXIT, BombsFrame::OnExit) EVT_MENU(wxID_EXIT, BombsFrame::OnExit)
EVT_MENU(wxID_ABOUT, BombsFrame::OnAbout) 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_MEDIUM, wxT("&Medium (15x15)\tCtrl-2"));
menuLevel->AppendRadioItem(bombsID_HARD, wxT("&Hard (25x20)\tCtrl-3")); menuLevel->AppendRadioItem(bombsID_HARD, wxT("&Hard (25x20)\tCtrl-3"));
menuFile->Append(bombsID_NEWGAME, wxT("&New Game"), menuFile->Append(wxID_NEW, wxT("&New game\tCtrl-N"));
menuLevel, wxT("Starts a new game")); menuFile->Append(bombsID_LEVEL, wxT("&Level"),menuLevel, wxT("Starts a new game"));
menuFile->AppendCheckItem(bombsID_EASYCORNER, wxT("&Easy corner")); menuFile->AppendCheckItem(bombsID_EASYCORNER, wxT("&Easy corner"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
@@ -177,17 +178,22 @@ void BombsFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxT("About wxBombs") ); 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); NewGame(bombsID_EASY, true);
} }
void BombsFrame::OnNewMediumGame(wxCommandEvent& WXUNUSED(event)) void BombsFrame::OnMediumGame(wxCommandEvent& WXUNUSED(event))
{ {
NewGame(bombsID_MEDIUM, true); NewGame(bombsID_MEDIUM, true);
} }
void BombsFrame::OnNewHardGame(wxCommandEvent& WXUNUSED(event)) void BombsFrame::OnHardGame(wxCommandEvent& WXUNUSED(event))
{ {
NewGame(bombsID_HARD, true); NewGame(bombsID_HARD, true);
} }

11
demos/bombs/bombs.h
View File

@@ -2,7 +2,7 @@
// Name: bombs.h // Name: bombs.h
// Purpose: Bombs game // Purpose: Bombs game
// Author: P. Foggia 1996 // Author: P. Foggia 1996
// Modified by: Wlodzimierz Skiba (ABX) 2003 // Modified by: Wlodzimierz Skiba (ABX) since 2003
// Created: 1996 // Created: 1996
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1996 P. Foggia // Copyright: (c) 1996 P. Foggia
@@ -45,9 +45,10 @@ public:
private: private:
void OnNewEasyGame(wxCommandEvent& event); void OnNewGame(wxCommandEvent& event);
void OnNewMediumGame(wxCommandEvent& event); void OnEasyGame(wxCommandEvent& event);
void OnNewHardGame(wxCommandEvent& event); void OnMediumGame(wxCommandEvent& event);
void OnHardGame(wxCommandEvent& event);
void OnEasyCorner(wxCommandEvent& event); void OnEasyCorner(wxCommandEvent& event);
@@ -68,7 +69,7 @@ private:
// App specific menu identifiers // App specific menu identifiers
enum enum
{ {
bombsID_NEWGAME = wxID_HIGHEST, bombsID_LEVEL = wxID_HIGHEST,
bombsID_EASY, bombsID_EASY,
bombsID_MEDIUM, bombsID_MEDIUM,
bombsID_HARD, bombsID_HARD,

2
demos/bombs/bombs1.cpp
View File

@@ -2,7 +2,7 @@
// Name: bombs1.cpp // Name: bombs1.cpp
// Purpose: Bombs game // Purpose: Bombs game
// Author: P. Foggia 1996 // Author: P. Foggia 1996
// Modified by: Wlodzimierz Skiba (ABX) 2003 // Modified by: Wlodzimierz Skiba (ABX) since 2003
// Created: 1996 // Created: 1996
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1996 P. Foggia // Copyright: (c) 1996 P. Foggia

2
demos/bombs/game.cpp
View File

@@ -2,7 +2,7 @@
// Name: bombs1.cpp // Name: bombs1.cpp
// Purpose: Implementation of the class BombsGame // Purpose: Implementation of the class BombsGame
// Author: P. Foggia 1996 // Author: P. Foggia 1996
// Modified by: Wlodzimierz Skiba (ABX) 2003 // Modified by: Wlodzimierz Skiba (ABX) since 2003
// Created: 1996 // Created: 1996
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1996 P. Foggia // Copyright: (c) 1996 P. Foggia

2
demos/bombs/game.h
View File

@@ -2,7 +2,7 @@
// Name: game.h // Name: game.h
// Purpose: Bombs game // Purpose: Bombs game
// Author: P. Foggia 1996 // Author: P. Foggia 1996
// Modified by: Wlodzimierz Skiba (ABX) 2003 // Modified by: Wlodzimierz Skiba (ABX) since 2003
// Created: 1996 // Created: 1996
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1996 P. Foggia // Copyright: (c) 1996 P. Foggia