X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5292c055a6d229c873168934f4c0ae1393218202..672aead4a3a119f5dcc6e74147ceeb642a53ab67:/demos/life/life.cpp?ds=sidebyside diff --git a/demos/life/life.cpp b/demos/life/life.cpp index 2ff4a9e43a..62a42a72e7 100644 --- a/demos/life/life.cpp +++ b/demos/life/life.cpp @@ -199,7 +199,7 @@ LifeFrame::LifeFrame() : menuFile->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _("Start a new game")); menuFile->Append(wxID_OPEN, wxGetStockLabel(wxID_OPEN), _("Open an existing Life pattern")); menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration")); -#ifndef __WXWINCE__ +#if ! (defined(__SMARTPHONE__) || defined(__POCKETPC__)) menuFile->AppendSeparator(); menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT, true, _T("Alt-X")), _("Quit this program")); @@ -689,7 +689,13 @@ void LifeNavigator::OnClose(wxCloseEvent& event) // canvas constructor LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive) : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxSize(100, 100), - wxSUNKEN_BORDER|wxFULL_REPAINT_ON_RESIZE) + wxFULL_REPAINT_ON_RESIZE +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) + |wxSUNKEN_BORDER +#else + |wxSIMPLE_BORDER +#endif + ) { m_life = life; m_interactive = interactive;