Fix unit tests compilation in STL build.

[wxWidgets.git] / demos / bombs / bombs.h

diff --git a/demos/bombs/bombs.h b/demos/bombs/bombs.h
index dbe4a3072529a56242433209b513b036cf40eb97..52ee72bd9deaca74f48f51a4b834665697951ba0 100644 (file)
--- a/demos/bombs/bombs.h
+++ b/demos/bombs/bombs.h
@@ -2,7 +2,7 @@
 // Name:        bombs.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996
 // Name:        bombs.h
 // Purpose:     Bombs game
 // Author:      P. Foggia 1996

-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003

 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia


@@ -45,9 +45,10 @@ public:
 
 private:
 
 
 private:
 

-    void OnNewEasyGame(wxCommandEvent& event);
-    void OnNewMediumGame(wxCommandEvent& event);
-    void OnNewHardGame(wxCommandEvent& event);
+    void OnNewGame(wxCommandEvent& event);
+    void OnEasyGame(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
 enum
 {
 // App specific menu identifiers
 enum
 {

-    bombsID_NEWGAME = wxID_HIGHEST,
+    bombsID_LEVEL = wxID_HIGHEST,

     bombsID_EASY,
     bombsID_MEDIUM,
     bombsID_HARD,
     bombsID_EASY,
     bombsID_MEDIUM,
     bombsID_HARD,


@@ -87,7 +88,7 @@ public:
 
     wxSize GetGridSizeInPixels() const;
 
 
     wxSize GetGridSizeInPixels() const;
 

-    ~BombsCanvas();
+    virtual ~BombsCanvas();

 
 private:
 
 
 private: