ncurses 6.1 - patch 20191221

[ncurses.git] / c++ / cursesf.h

diff --git a/c++/cursesf.h b/c++/cursesf.h
index 23bc0f5b0f5c3ff34a4161988b25558d80af44a8..746b222a2aca97b068e3e585b5d2973b00fab06a 100644 (file)
--- a/c++/cursesf.h
+++ b/c++/cursesf.h
@@ -1,6 +1,6 @@
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************
 // * This makes emacs happy -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,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            *


@@ -31,7 +31,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursesf.h,v 1.30 2012/06/08 17:43:56 Richard.Yao Exp $
+// $Id: cursesf.h,v 1.33 2019/07/28 19:55:27 tom Exp $

 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1
 
 #ifndef NCURSES_CURSESF_H_incl
 #define NCURSES_CURSESF_H_incl 1


@@ -61,7 +61,7 @@ class NCURSES_IMPEXP NCursesFieldType
 protected:
   FIELDTYPE* fieldtype;
 
 protected:
   FIELDTYPE* fieldtype;
 

-  inline void OnError(int err) const THROWS(NCursesFormException) {
+  inline void OnError(int err) const THROW2(NCursesException const, NCursesFormException) {

     if (err!=E_OK)
       THROW(new NCursesFormException (err));
   }
     if (err!=E_OK)
       THROW(new NCursesFormException (err));
   }


@@ -109,7 +109,7 @@ protected:
   NCursesFieldType* ftype;   // Associated field type
 
   // Error handler
   NCursesFieldType* ftype;   // Associated field type
 
   // Error handler

-  inline void OnError (int err) const THROWS(NCursesFormException) {
+  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {

     if (err != E_OK)
       THROW(new NCursesFormException (err));
   }
     if (err != E_OK)
       THROW(new NCursesFormException (err));
   }


@@ -151,7 +151,7 @@ public:
   {
   }
 
   {
   }
 

-  virtual ~NCursesFormField ();
+  virtual ~NCursesFormField () THROWS(NCursesException);

 
   // Duplicate the field at a new position
   inline NCursesFormField* dup(int first_row, int first_col)
 
   // Duplicate the field at a new position
   inline NCursesFormField* dup(int first_row, int first_col)


@@ -391,7 +391,7 @@ protected:
                 bool with_frame,
                 bool autoDeleteFields);
 
                 bool with_frame,
                 bool autoDeleteFields);
 

-  inline void OnError (int err) const THROWS(NCursesFormException) {
+  inline void OnError (int err) const THROW2(NCursesException const, NCursesFormException) {

     if (err != E_OK)
       THROW(new NCursesFormException (err));
   }
     if (err != E_OK)
       THROW(new NCursesFormException (err));
   }


@@ -470,7 +470,7 @@ public:
   {
   }
 
   {
   }
 

-  virtual ~NCursesForm();
+  virtual ~NCursesForm() THROWS(NCursesException);

 
   // Set the default attributes for the form
   virtual void setDefaultAttributes();
 
   // Set the default attributes for the form
   virtual void setDefaultAttributes();


@@ -645,7 +645,7 @@ public:
        OnError(::set_field_userptr(field, STATIC_CAST(void *)(p_UserData)));
   }
 
        OnError(::set_field_userptr(field, STATIC_CAST(void *)(p_UserData)));
   }
 

-  virtual ~NCursesUserField() {};
+  virtual ~NCursesUserField() THROWS(NCursesException) {};

 
   inline const T* UserData (void) const {
     return reinterpret_cast<const T*>(::field_userptr (field));
 
   inline const T* UserData (void) const {
     return reinterpret_cast<const T*>(::field_userptr (field));


@@ -673,7 +673,8 @@ protected:
                   const T* p_UserData = STATIC_CAST(T*)(0))
     : NCursesForm(nlines,ncols,begin_y,begin_x) {
       if (form)
                   const T* p_UserData = STATIC_CAST(T*)(0))
     : NCursesForm(nlines,ncols,begin_y,begin_x) {
       if (form)

-       set_user (const_cast<void *>(p_UserData));
+       set_user (const_cast<void *>(reinterpret_cast<const void*>
+                                    (p_UserData)));

   }
 
 public:
   }
 
 public:


@@ -683,7 +684,7 @@ public:
                   bool autoDelete_Fields=FALSE)
     : NCursesForm (Fields, with_frame, autoDelete_Fields) {
       if (form)
                   bool autoDelete_Fields=FALSE)
     : NCursesForm (Fields, with_frame, autoDelete_Fields) {
       if (form)

-       set_user (const_cast<void *>(p_UserData));
+       set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));

   };
 
   NCursesUserForm (NCursesFormField* Fields[],
   };
 
   NCursesUserForm (NCursesFormField* Fields[],


@@ -697,19 +698,20 @@ public:
     : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
                   with_frame, autoDelete_Fields) {
       if (form)
     : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
                   with_frame, autoDelete_Fields) {
       if (form)

-       set_user (const_cast<void *>(p_UserData));
+       set_user (const_cast<void *>(reinterpret_cast<const void*>
+                                    (p_UserData)));

   };
 
   };
 

-  virtual ~NCursesUserForm() {
+  virtual ~NCursesUserForm() THROWS(NCursesException) {

   };
 
   };
 

-  inline T* UserData (void) const {
+  inline T* UserData (void) {

     return reinterpret_cast<T*>(get_user ());
   };
 
   inline virtual void setUserData (const T* p_UserData) {
     if (form)
     return reinterpret_cast<T*>(get_user ());
   };
 
   inline virtual void setUserData (const T* p_UserData) {
     if (form)

-      set_user (const_cast<void *>(p_UserData));
+      set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData)));

   }
 
 };
   }
 
 };