virtual method hiding in GTK, so add direct implementation

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

diff --git a/demos/life/game.h b/demos/life/game.h
index 6693c2aeef5ad641bc30455f0706b9b62bdf68f3..a95dae26567da20f5d20eac9304ab66821174d53 100644 (file)
--- a/demos/life/game.h
+++ b/demos/life/game.h
@@ -12,22 +12,6 @@
 #ifndef _LIFE_GAME_H_
 #define _LIFE_GAME_H_
 
 #ifndef _LIFE_GAME_H_
 #define _LIFE_GAME_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "game.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
-

 // --------------------------------------------------------------------------
 // LifePattern
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // LifePattern
 // --------------------------------------------------------------------------


@@ -47,8 +31,8 @@ public:
         m_rules       = rules;
         m_shape       = shape;
     };
         m_rules       = rules;
         m_shape       = shape;
     };

-    
-    // A more convenient ctor for the built-in samples    
+
+    // A more convenient ctor for the built-in samples

     LifePattern(wxString      name,
                 wxString      description,
                 int           width,
     LifePattern(wxString      name,
                 wxString      description,
                 int           width,


@@ -57,8 +41,13 @@ public:
     {
         m_name        = name;
         m_description = description;
     {
         m_name        = name;
         m_description = description;

-        m_rules       = _("");
-        m_shape.Add( wxString::Format(_T("%i %i"), -width/2, -height/2) );
+        m_rules       = wxEmptyString;
+        // TODO: add the positions later, since the formatting command
+        // causes a crash due to conversion objects not being available
+        // during initialisation.
+#ifndef __WXMAC__
+        m_shape.Add( wxString::Format(wxT("%i %i"), -width/2, -height/2) );
+#endif

         for(int j = 0; j < height; j++)
         {
             wxString tmp;
         for(int j = 0; j < height; j++)
         {
             wxString tmp;


@@ -88,7 +77,7 @@ struct LifeCell
 {
     wxInt32 i;
     wxInt32 j;
 {
     wxInt32 i;
     wxInt32 j;

-};       
+};

 
 // A private class that contains data about a block of cells
 class LifeCellBox;
 
 // A private class that contains data about a block of cells
 class LifeCellBox;