Enhanced stock labels usage. Source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index f08dbe9ba9bd5d51a7fc253eeeb38b3d7c75af57..53de513670ace9215525212e48818f8886f7c1d8 100644 (file)
--- 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 <stdlib.h>
@@ -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 aa4bb3ced3c782e8dbf244642d8c6e534636ed7b..e6daa2560737137dadf288f446cbb53bae57df9b 100644 (file)
--- 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;