applying editor part of patch, see #15003

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

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

-// 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
 // --------------------------------------------------------------------------


@@ -54,7 +42,12 @@ public:
         m_name        = name;
         m_description = description;
         m_rules       = wxEmptyString;
         m_name        = name;
         m_description = description;
         m_rules       = wxEmptyString;

-        m_shape.Add( wxString::Format(_T("%i %i"), -width/2, -height/2) );
+        // 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;