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 c3923151fd1e0720a85000004022cf08f9ab8a65..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
-// Modified by: Wlodzimierz Skiba (ABX) 2003
+// Modified by: Wlodzimierz Skiba (ABX) since 2003
 // Created:     1996
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 P. Foggia
@@ -45,15 +45,20 @@ public:
 
 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 OnExit(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);
 
     BombsGame *m_game;
+    bool m_easyCorner;
+    int m_lastLevel;
 
     // Subwindows for reference within the program.
     BombsCanvas *m_canvas;
@@ -64,10 +69,11 @@ private:
 // App specific menu identifiers
 enum
 {
-    bombsID_NEWGAME = wxID_HIGHEST,
+    bombsID_LEVEL = wxID_HIGHEST,
     bombsID_EASY,
     bombsID_MEDIUM,
-    bombsID_HARD
+    bombsID_HARD,
+    bombsID_EASYCORNER
 };
 
 class BombsCanvas : public wxPanel
@@ -82,7 +88,7 @@ public:
 
     wxSize GetGridSizeInPixels() const;
 
-    ~BombsCanvas();
+    virtual ~BombsCanvas();
 
 private: