X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53d90250ad76d846993c16b558382dd5b47b7bd5..52988b5f63f90cf4f4bf844c31b1b0b1ee0b19c3:/demos/life/life.cpp?ds=inline diff --git a/demos/life/life.cpp b/demos/life/life.cpp index f6295f5981..13376c261c 100644 --- a/demos/life/life.cpp +++ b/demos/life/life.cpp @@ -150,7 +150,7 @@ IMPLEMENT_APP(LifeApp) // some shortcuts #define ADD_TOOL(id, bmp, tooltip, help) \ - toolBar->AddTool(id, bmp, wxNullBitmap, false, wxDefaultCoord, wxDefaultCoord, (wxObject *)NULL, tooltip, help) + toolBar->AddTool(id, wxEmptyString, bmp, wxNullBitmap, wxITEM_NORMAL, tooltip, help) // -------------------------------------------------------------------------- @@ -693,7 +693,7 @@ void LifeNavigator::OnClose(wxCloseEvent& event) // canvas constructor LifeCanvas::LifeCanvas(wxWindow *parent, Life *life, bool interactive) : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxSize(100, 100), - wxFULL_REPAINT_ON_RESIZE + wxFULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) |wxSUNKEN_BORDER #else