compilation fix

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

diff --git a/demos/life/life.h b/demos/life/life.h
index 7e7777bd15e54baf2afe68b7b02d4e55d37e1560..dd36aebe3931394231094825131997783bb2311f 100644 (file)
--- a/demos/life/life.h
+++ b/demos/life/life.h
@@ -12,22 +12,6 @@
 #ifndef _LIFE_APP_H_
 #define _LIFE_APP_H_
 
 #ifndef _LIFE_APP_H_
 #define _LIFE_APP_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "life.h"
-#endif
-
-// for compilers that support precompilation, includes "wx/wx.h"
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-

 #include "wx/minifram.h"
 
 #include "game.h"
 #include "wx/minifram.h"
 
 #include "game.h"


@@ -44,8 +28,8 @@ class LifeCanvas : public wxWindow
 {
 public:
     // ctor and dtor
 {
 public:
     // ctor and dtor

-    LifeCanvas(wxWindow* parent, Life* life, bool interactive = TRUE);
-    ~LifeCanvas();
+    LifeCanvas(wxWindow* parent, Life* life, bool interactive = true);
+    virtual ~LifeCanvas();

 
     // view management
     int  GetCellSize() const { return m_cellsize; };
 
     // view management
     int  GetCellSize() const { return m_cellsize; };


@@ -92,9 +76,9 @@ private:
     wxInt32      m_viewportY;       // first visible cell (y coord)
     wxInt32      m_viewportW;       // number of visible cells (w)
     wxInt32      m_viewportH;       // number of visible cells (h)
     wxInt32      m_viewportY;       // first visible cell (y coord)
     wxInt32      m_viewportW;       // number of visible cells (w)
     wxInt32      m_viewportH;       // number of visible cells (h)

-    int          m_thumbX;          // horiz. scrollbar thumb position 
-    int          m_thumbY;          // vert. scrollbar thumb position 
-    wxInt32      m_mi, m_mj;        // last mouse position 
+    int          m_thumbX;          // horiz. scrollbar thumb position
+    int          m_thumbY;          // vert. scrollbar thumb position
+    wxInt32      m_mi, m_mj;        // last mouse position

 };
 
 
 };
 
 


@@ -126,7 +110,7 @@ class LifeFrame : public wxFrame
 public:
     // ctor and dtor
     LifeFrame();
 public:
     // ctor and dtor
     LifeFrame();

-    ~LifeFrame();
+    virtual ~LifeFrame();

 
     // member functions
     void UpdateInfoText();
 
     // member functions
     void UpdateInfoText();


@@ -151,7 +135,7 @@ private:
     void OnStop();
     void OnStep();
 
     void OnStop();
     void OnStep();
 

-    Life           *m_life;  
+    Life           *m_life;

     LifeCanvas     *m_canvas;
     LifeNavigator  *m_navigator;
     wxStaticText   *m_text;
     LifeCanvas     *m_canvas;
     LifeNavigator  *m_navigator;
     wxStaticText   *m_text;