X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=c%2B%2B%2Fdemo.cc;h=2423111d3d81e69e2ffe124eb88e1c21987d6fd8;hp=7acdd0933f10364084e2c466cffb676c9cd1140a;hb=4496a3f032d219fc5f622e9d82b0cd749e36fa0e;hpb=f3eb40315f9e5eff503a172aed6d325b4e1f20c6 diff --git a/c++/demo.cc b/c++/demo.cc index 7acdd093..2423111d 100644 --- a/c++/demo.cc +++ b/c++/demo.cc @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -35,7 +35,7 @@ * Demo code for NCursesMenu and NCursesForm written by * Juergen Pfeifer * - * $Id: demo.cc,v 1.40 2011/09/17 22:12:10 tom Exp $ + * $Id: demo.cc,v 1.43 2018/06/24 00:07:22 tom Exp $ */ #include "internal.h" @@ -43,11 +43,11 @@ #include "cursesm.h" #include "cursesf.h" -#ifdef __MINGW32__ +#ifdef _WIN32 #undef KEY_EVENT #endif -#ifndef __MINGW32__ +#ifndef _WIN32 extern "C" unsigned int sleep(unsigned int); #endif @@ -320,7 +320,7 @@ public: for(int i=1; i <= S->labels(); i++) { char buf[8]; assert(i < 100); - ::sprintf(buf, "Frm%02d", i); + ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i % 100); (*S)[i] = buf; // Text (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification } @@ -540,7 +540,7 @@ void TestApplication::init_labels(Soft_Label_Key_Set& S) const for(int i=1; i <= S.labels(); i++) { char buf[8]; assert(i < 100); - ::sprintf(buf, "Key%02d", i); + ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i % 100); S[i] = buf; // Text S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification }