ncurses 6.2 - patch 20200704

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

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

- * Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2012,2017 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 +36,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.42 2017/06/24 22:04:26 tom Exp $
+ * $Id: demo.cc,v 1.46 2020/05/24 01:40:20 anonymous.maarten Exp $

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


@@ -43,11 +44,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 +177,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;


@@ -186,7 +187,7 @@ public:
 };
 
 template class MyAction<UserData>;
 };
 
 template class MyAction<UserData>;

-template class NCURSES_IMPEXP NCursesUserItem<UserData>;
+template class NCURSES_CXX_IMPEXP NCursesUserItem<UserData>;

 
 class QuitItem : public NCursesMenuItem
 {
 
 class QuitItem : public NCursesMenuItem
 {


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

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

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


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

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

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