ncurses 6.0 - patch 20160123

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

diff --git a/c++/demo.cc b/c++/demo.cc
index 8fa19ad2652c0595d751fc1b1d990ff2cd539c61..8bcfb146420ea3f752b2dad9bcf6a6f9a2402bdb 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-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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.36 2007/04/07 20:24:49 tom Exp $
+ * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $

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


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

+#ifdef __MINGW32__
+#undef KEY_EVENT
+#endif
+
+#ifndef __MINGW32__

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

+#endif

 
 #undef index // needed for NeXT
 
 
 #undef index // needed for NeXT
 


@@ -214,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) {


@@ -312,13 +319,15 @@ public:
     Soft_Label_Key_Set* S = new Soft_Label_Key_Set;
     for(int i=1; i <= S->labels(); i++) {
       char buf[8];
     Soft_Label_Key_Set* S = new Soft_Label_Key_Set;
     for(int i=1; i <= S->labels(); i++) {
       char buf[8];

-      ::sprintf(buf, "Frm%02d", i);
+      assert(i < 100);
+      ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i);

       (*S)[i] = buf;                                      // Text
       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
     }
     NCursesApplication::getApplication()->push(*S);
     F();
     NCursesApplication::getApplication()->pop();
       (*S)[i] = buf;                                      // Text
       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
     }
     NCursesApplication::getApplication()->push(*S);
     F();
     NCursesApplication::getApplication()->pop();

+    delete S;

     return FALSE;
   }
 };
     return FALSE;
   }
 };


@@ -530,7 +539,8 @@ void TestApplication::init_labels(Soft_Label_Key_Set& S) const
 {
   for(int i=1; i <= S.labels(); i++) {
     char buf[8];
 {
   for(int i=1; i <= S.labels(); i++) {
     char buf[8];

-    ::sprintf(buf, "Key%02d", i);
+    assert(i < 100);
+    ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i);

     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
   }