X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764835a5d5b72c635527bfbb350d190c89381b44..83437648602497778e3db21775ca171f3f40705e:/demos/life/game.h?ds=sidebyside diff --git a/demos/life/game.h b/demos/life/game.h index 1366c18fec..b86757ebf9 100644 --- a/demos/life/game.h +++ b/demos/life/game.h @@ -12,7 +12,7 @@ #ifndef _LIFE_GAME_H_ #define _LIFE_GAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "game.h" #endif @@ -58,9 +58,18 @@ public: 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++) - 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;