Changeset 151 for trunk

Timestamp:

21/02/08 18:58:18 (5 years ago)

Author:

guyru

Message:

use standard identifiers for the new game and undo menu items

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (8 diffs)
• ObjectsID.h (modified) (1 diff)

trunk/src/MainFrame.cpp

@@ -1 @@
-// $Header$
 /***************************************************************************
  *   Copyright (C) 2006-2008 by Guy Rutenberg   *
@@ -100 +99 @@
         
         //disable the undo button
-        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+        (GetMenuBar()->FindItem(wxID_UNDO))->Enable(false);
 
         ConnectEventTable();
@@ -132 +131 @@
 
         //insert menu items into menu Game
-        gameMenu->Append(ID_NEWGAME,wxT("&New Game\tF2"),wxT("Start a new game"));
-        //create the undo button and make it disabled
-        gameMenu->Append(ID_UNDO,wxT("&Undo\tCTRL+Z"),wxT("Undo the last move"));
+        gameMenu->Append(wxID_NEW,wxT("&New Game\tF2"),wxT("Start a new game"));
+        gameMenu->Append(wxID_UNDO,wxT("&Undo\tCTRL+Z"),wxT("Undo the last move"));
         gameMenu->Append(ID_SHOWHIGHSCORE,wxT("High &Scores"),wxT("Show high-scores table"));
         gameMenu->Append(ID_SETTINGS,wxT("Settings"),wxT("Show settings dialog"));
         gameMenu->Append(ID_THEMES,wxT("Dice Theme..."),wxT("Select a dice theme"));
-        gameMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"),
-                        wxT("Quit this program"));
+        gameMenu->Append(wxID_EXIT);
         
         // Declare the menu-bar and append the freshly created menus to the menu bar...
@@ -331 +328 @@
         Connect(ID_CHECK_FOR_UPDATES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnCheckForUpdates));
         Connect(ID_SENDCOMMENT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnSendComment));
-        Connect(ID_NEWGAME, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnNewGame));
-        Connect(ID_UNDO, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnUndo));
+        Connect(wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnNewGame));
+        Connect(wxID_UNDO, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnUndo));
         Connect(ID_SHOWHIGHSCORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnShowHighscore));
         Connect(ID_SETTINGS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnSettings));
@@ -424 +421 @@
 {
         //disable the undo button so it won't be enabled when a new game is started.
-        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+        (GetMenuBar()->FindItem(wxID_UNDO))->Enable(false);
         
         ResetRolls();
@@ -483 +480 @@
         CalculateSubTotal();
 
-        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+        (GetMenuBar()->FindItem(wxID_UNDO))->Enable(false);
         //cancel the counting for the choice that was canceled
         m_numofplaysleft++;
@@ -495 +492 @@
 {
         if (m_numofplaysleft) {
-                (GetMenuBar()->FindItem(ID_UNDO))->Enable(true);
+                (GetMenuBar()->FindItem(wxID_UNDO))->Enable(true);
                 m_lastmove = id;
         }
@@ -664 +661 @@
         
         //we rolled the dices so undoing isn't allowed
-        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+        (GetMenuBar()->FindItem(wxID_UNDO))->Enable(false);
         m_yahtzeebonus = false; //if we scored yahtzee bonus before we don't care anymore.
         

trunk/src/ObjectsID.h

@@ -24 +24 @@
 enum {
         ID_PANEL,
-        ID_NEWGAME,
-        ID_UNDO,
         ID_SHOWHIGHSCORE,
         ID_SETTINGS,