Backported Unicode compilation fixes for demos and exec sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
@@ -194,9 +194,9 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
|
||||
SetIcon(wxICON(mondrian));
|
||||
|
||||
// menu bar
|
||||
wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
|
||||
wxMenu *menuView = new wxMenu("", wxMENU_TEAROFF);
|
||||
wxMenu *menuGame = new wxMenu("", wxMENU_TEAROFF);
|
||||
wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
|
||||
wxMenu *menuView = new wxMenu(_T(""), wxMENU_TEAROFF);
|
||||
wxMenu *menuGame = new wxMenu(_T(""), wxMENU_TEAROFF);
|
||||
|
||||
menuFile->Append(ID_NEW, _("&New"), _("Start a new game"));
|
||||
menuFile->Append(ID_OPEN, _("&Open..."), _("Open an existing Life pattern"));
|
||||
|
Reference in New Issue
Block a user