X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254a21292b0ccf234ed1dbc6acd37708672ffcc0..a57d600f1aa4bae88f4c9b8d89a35332c412939e:/demos/forty/forty.cpp?ds=inline diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp index 7713b93d50..7df7acf9a6 100644 --- a/demos/forty/forty.cpp +++ b/demos/forty/forty.cpp @@ -11,11 +11,6 @@ // Last modified: 22nd July 1998 - ported to wxWidgets 2.0 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -37,13 +32,15 @@ #include "wx/html/htmlwin.h" #endif +#include "wx/stockitem.h" + BEGIN_EVENT_TABLE(FortyFrame, wxFrame) - EVT_MENU(NEW_GAME, FortyFrame::NewGame) + EVT_MENU(wxID_NEW, FortyFrame::NewGame) EVT_MENU(wxID_EXIT, FortyFrame::Exit) EVT_MENU(wxID_ABOUT, FortyFrame::About) EVT_MENU(wxID_HELP_CONTENTS, FortyFrame::Help) - EVT_MENU(UNDO, FortyFrame::Undo) - EVT_MENU(REDO, FortyFrame::Redo) + EVT_MENU(wxID_UNDO, FortyFrame::Undo) + EVT_MENU(wxID_REDO, FortyFrame::Redo) EVT_MENU(SCORES, FortyFrame::Scores) EVT_MENU(RIGHT_BUTTON_UNDO, FortyFrame::ToggleRightButtonUndo) EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand) @@ -151,13 +148,13 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos // Make a menu bar wxMenu* gameMenu = new wxMenu; - gameMenu->Append(NEW_GAME, _T("&New"), _T("Start a new game")); + gameMenu->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _T("Start a new game")); gameMenu->Append(SCORES, _T("&Scores..."), _T("Displays scores")); - gameMenu->Append(wxID_EXIT, _T("E&xit"), _T("Exits Forty Thieves")); + gameMenu->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT), _T("Exits Forty Thieves")); wxMenu* editMenu = new wxMenu; - editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move")); - editMenu->Append(REDO, _T("&Redo"), _T("Redo a move that has been undone")); + editMenu->Append(wxID_UNDO, wxGetStockLabel(wxID_UNDO), _T("Undo the last move")); + editMenu->Append(wxID_REDO, wxGetStockLabel(wxID_REDO), _T("Redo a move that has been undone")); wxMenu* optionsMenu = new wxMenu; optionsMenu->Append(RIGHT_BUTTON_UNDO, @@ -308,6 +305,7 @@ FortyFrame::ToggleCardSize(wxCommandEvent& event) //---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(FortyAboutDialog,wxDialog) + EVT_BUTTON(wxID_CLOSE, wxDialog::OnOK) END_EVENT_TABLE() FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title, @@ -336,7 +334,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent) } } - if (htmlText.IsEmpty()) + if (htmlText.empty()) { htmlText.Printf(wxT("
Sorry, could not find resource for About dialog
")); } @@ -366,7 +364,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent) wxASSERT( item1 ); item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 ); - wxButton *item2 = new wxButton( parent, wxID_CANCEL, _T("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton *item2 = new wxButton( parent, wxID_CLOSE ); item2->SetDefault(); item2->SetFocus();