ncurses 6.1 - patch 20191221

[ncurses.git] / c++ / demo.cc

diff --git a/c++/demo.cc b/c++/demo.cc
index 35433425f1fcc20cf383ee9c0cd1b96911b88ad4..37e50c761fb7c111cf7624492392e6d1203fc4b6 100644 (file)
--- a/c++/demo.cc
+++ b/c++/demo.cc
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
  *                                                                          *
  * 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
  *
  *   Demo code for NCursesMenu and NCursesForm written by
  *   Juergen Pfeifer
  *

- * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $
+ * $Id: demo.cc,v 1.44 2019/07/28 19:55:27 tom Exp $

  */
 
 #include "internal.h"
  */
 
 #include "internal.h"


@@ -43,11 +43,11 @@
 #include "cursesm.h"
 #include "cursesf.h"
 
 #include "cursesm.h"
 #include "cursesf.h"
 

-#ifdef __MINGW32__
+#ifdef _WIN32

 #undef KEY_EVENT
 #endif
 
 #undef KEY_EVENT
 #endif
 

-#ifndef __MINGW32__
+#ifndef _WIN32

 extern "C" unsigned int sleep(unsigned int);
 #endif
 
 extern "C" unsigned int sleep(unsigned int);
 #endif
 


@@ -176,7 +176,7 @@ public:
     : NCursesUserItem<T>(p_name, static_cast<const char*>(0), p_UserData)
   {}
 
     : NCursesUserItem<T>(p_name, static_cast<const char*>(0), p_UserData)
   {}
 

-  virtual ~MyAction() {}
+  virtual ~MyAction() THROWS(NCursesException) {}

 
   bool action() {
     SillyDemo a;
 
   bool action() {
     SillyDemo a;


@@ -220,6 +220,7 @@ private:
   int chk;
 protected:
   bool field_check(NCursesFormField& f) {
   int chk;
 protected:
   bool field_check(NCursesFormField& f) {

+    (void) f;

     return TRUE;
   }
   bool char_check(int c) {
     return TRUE;
   }
   bool char_check(int c) {


@@ -294,7 +295,7 @@ public:
   {
   }
 
   {
   }
 

-  ~TestForm() {
+  ~TestForm() THROWS(NCursesException) {

     delete mft;
     delete ift;
     delete eft;
     delete mft;
     delete ift;
     delete eft;


@@ -319,7 +320,7 @@ public:
     for(int i=1; i <= S->labels(); i++) {
       char buf[8];
       assert(i < 100);
     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
     }
       (*S)[i] = buf;                                      // Text
       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
     }


@@ -472,7 +473,7 @@ public:
   {
   }
 
   {
   }
 

-  ~MyMenu()
+  ~MyMenu() THROWS(NCursesException)

   {
     P->hide();
     delete P;
   {
     P->hide();
     delete P;


@@ -539,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);
   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
   }
     S[i] = buf;                                      // Text
     S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
   }