The ACTION_MENU constructor now takes the tool as an argument, so the call to SetTool() immediately following it can be removed and the tool just passed into the constructor.