Updating MSW file list.

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

diff --git a/demos/life/life.h b/demos/life/life.h
index 75cd4d23a1dc9e6deb39621ec01c794dc7d34cf6..5dd43cf0b1a708ef122a10a953d8db66da5356cc 100644 (file)
--- a/demos/life/life.h
+++ b/demos/life/life.h
@@ -12,10 +12,6 @@
 #ifndef _LIFE_APP_H_
 #define _LIFE_APP_H_
 
 #ifndef _LIFE_APP_H_
 #define _LIFE_APP_H_
 

-#ifdef __GNUG__
-    #pragma interface "life.h"
-#endif
-

 // for compilers that support precompilation, includes "wx/wx.h"
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx/wx.h"
 #include "wx/wxprec.h"
 


@@ -44,7 +40,7 @@ class LifeCanvas : public wxWindow
 {
 public:
     // ctor and dtor
 {
 public:
     // ctor and dtor

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

     ~LifeCanvas();
 
     // view management
     ~LifeCanvas();
 
     // view management


@@ -57,7 +53,7 @@ public:
     void DrawCell(wxInt32 i, wxInt32 j, bool alive);
 
 private:
     void DrawCell(wxInt32 i, wxInt32 j, bool alive);
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 
     // draw a cell (parametrized by DC)
     DECLARE_EVENT_TABLE()
 
     // draw a cell (parametrized by DC)


@@ -92,9 +88,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

 };
 
 
 };
 
 


@@ -109,7 +105,7 @@ public:
     LifeNavigator(wxWindow *parent);
 
 private:
     LifeNavigator(wxWindow *parent);
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 
     // event handlers
     DECLARE_EVENT_TABLE()
 
     // event handlers


@@ -133,7 +129,7 @@ public:
     void UpdateUI();
 
 private:
     void UpdateUI();
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 
     // event handlers
     DECLARE_EVENT_TABLE()
 
     // event handlers


@@ -151,7 +147,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;