From 6759ff7d4de5817b4b93f10e0b697700f5a18467 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 31 Jan 2005 18:02:36 +0000 Subject: [PATCH] Enhanced stock labels usage. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/bombs/bombs.cpp | 4 +++- demos/bombs/bombs1.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp index f08dbe9ba9..53de513670 100644 --- a/demos/bombs/bombs.cpp +++ b/demos/bombs/bombs.cpp @@ -23,6 +23,8 @@ # include "wx/wx.h" #endif //precompiled headers +#include "wx/stockitem.h" + #include "bombs.h" #include @@ -90,7 +92,7 @@ BombsFrame::BombsFrame(BombsGame *game) menuLevel, wxT("Starts a new game")); menuFile->AppendSeparator(); - menuFile->Append(wxID_EXIT, wxT("E&xit"), wxT("Quits the application")); + menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT), wxT("Quits the application")); menuBar->Append(menuFile, wxT("&File")); diff --git a/demos/bombs/bombs1.cpp b/demos/bombs/bombs1.cpp index aa4bb3ced3..e6daa25607 100644 --- a/demos/bombs/bombs1.cpp +++ b/demos/bombs/bombs1.cpp @@ -66,7 +66,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2) wxFont font= BOMBS_FONT; - dc->SetFont(font); + dc->SetFont(font); for(x=xc1; x<=xc2; x++) for(y=yc1; y<=yc2; y++) @@ -153,7 +153,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2) buf = wxT("0"); dc->SetTextForeground(wxGreen); break; - case 1: + case 1: buf = wxT("1"); dc->SetTextForeground(wxBlue); break; @@ -263,7 +263,7 @@ void BombsCanvas::OnMouseEvent(wxMouseEvent& event) if ( (event.RightDown() || (event.LeftDown() && event.ShiftDown())) && (m_game->IsHidden(x,y) || !m_game->GetNumRemainingCells() ) ) - { + { // store previous and current field int prevFocusX = m_game->m_gridFocusX; int prevFocusY = m_game->m_gridFocusY; -- 2.47.2