Added wxButtonBase::GetDefaultSize stub

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

diff --git a/demos/life/game.h b/demos/life/game.h
index 1366c18fecaf83ba74c083a552977f7149ebc204..b86757ebf988c00afba760beeb964f76ba198c80 100644 (file)
--- a/demos/life/game.h
+++ b/demos/life/game.h
@@ -12,7 +12,7 @@
 #ifndef _LIFE_GAME_H_
 #define _LIFE_GAME_H_
 
 #ifndef _LIFE_GAME_H_
 #define _LIFE_GAME_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "game.h"
 #endif
 
     #pragma interface "game.h"
 #endif
 


@@ -58,9 +58,18 @@ public:
         m_name        = name;
         m_description = description;
         m_rules       = _("");
         m_name        = name;
         m_description = description;
         m_rules       = _("");

-        m_shape.Add( wxString::Format("%i %i", -width/2, -height/2) );
+        m_shape.Add( wxString::Format(_T("%i %i"), -width/2, -height/2) );

         for(int j = 0; j < height; j++)
         for(int j = 0; j < height; j++)

-            m_shape.Add( wxString(shape + (j * width), (size_t) width) );        
+        {
+            wxString tmp;
+
+            for(int i = 0; i < width; i++)
+            {
+                tmp += wxChar(shape[j * width + i]);
+            }
+
+            m_shape.Add( tmp );
+        }

     };
 
     wxString      m_name;
     };
 
     wxString      m_name;