ncurses 6.2 - patch 20200906

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

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

- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2012,2014 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 +32,7 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursesf.h,v 1.32 2014/08/09 22:06:11 Adam.Jiang Exp $
+// $Id: cursesf.h,v 1.37 2020/07/18 19:57:11 anonymous.maarten Exp $

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


@@ -47,14 +48,14 @@ extern "C" {
 }
 //
 // -------------------------------------------------------------------------
 }
 //
 // -------------------------------------------------------------------------

-// The abstract base class for buitin and user defined Fieldtypes.
+// The abstract base class for builtin and user defined Fieldtypes.

 // -------------------------------------------------------------------------
 //
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP NCursesFormField; // forward declaration
+class NCURSES_CXX_IMPEXP NCursesFormField; // forward declaration

 
 // Class to represent builtin field types as well as C++ written new
 // fieldtypes (see classes UserDefineFieldType...
 
 // Class to represent builtin field types as well as C++ written new
 // fieldtypes (see classes UserDefineFieldType...

-class NCURSES_IMPEXP NCursesFieldType
+class NCURSES_CXX_IMPEXP NCursesFieldType

 {
   friend class NCursesFormField;
 
 {
   friend class NCursesFormField;
 


@@ -100,7 +101,7 @@ public:
 // The class representing a forms field, wrapping the lowlevel FIELD struct
 // -------------------------------------------------------------------------
 //
 // The class representing a forms field, wrapping the lowlevel FIELD struct
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP NCursesFormField
+class NCURSES_CXX_IMPEXP NCursesFormField

 {
   friend class NCursesForm;
 
 {
   friend class NCursesForm;
 


@@ -151,7 +152,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)


@@ -337,7 +338,7 @@ extern "C" {
 // The class representing a form, wrapping the lowlevel FORM struct
 // -------------------------------------------------------------------------
 //
 // The class representing a form, wrapping the lowlevel FORM struct
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP NCursesForm : public NCursesPanel
+class NCURSES_CXX_IMPEXP NCursesForm : public NCursesPanel

 {
 protected:
   FORM* form;  // the lowlevel structure
 {
 protected:
   FORM* form;  // the lowlevel structure


@@ -470,7 +471,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();


@@ -628,7 +629,7 @@ public:
 // data belongs to some class T. Use T as template argument
 // to create a UserField.
 // -------------------------------------------------------------------------
 // data belongs to some class T. Use T as template argument
 // to create a UserField.
 // -------------------------------------------------------------------------

-template<class T> class NCURSES_IMPEXP NCursesUserField : public NCursesFormField
+template<class T> class NCURSES_CXX_IMPEXP NCursesUserField : public NCursesFormField

 {
 public:
   NCursesUserField (int rows,
 {
 public:
   NCursesUserField (int rows,


@@ -645,7 +646,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));


@@ -661,7 +662,7 @@ public:
 // The same mechanism is used to attach user data to a form
 // -------------------------------------------------------------------------
 //
 // The same mechanism is used to attach user data to a form
 // -------------------------------------------------------------------------
 //

-template<class T> class NCURSES_IMPEXP NCursesUserForm : public NCursesForm
+template<class T> class NCURSES_CXX_IMPEXP NCursesUserForm : public NCursesForm

 {
 protected:
   // 'Internal' constructor, builds an object without association to a
 {
 protected:
   // 'Internal' constructor, builds an object without association to a


@@ -702,7 +703,7 @@ public:
                                     (p_UserData)));
   };
 
                                     (p_UserData)));
   };
 

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

   };
 
   inline T* UserData (void) {
   };
 
   inline T* UserData (void) {


@@ -720,7 +721,7 @@ public:
 // Builtin Fieldtypes
 // -------------------------------------------------------------------------
 //
 // Builtin Fieldtypes
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP Alpha_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Alpha_Field : public NCursesFieldType

 {
 private:
   int min_field_width;
 {
 private:
   int min_field_width;


@@ -736,7 +737,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP Alphanumeric_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Alphanumeric_Field : public NCursesFieldType

 {
 private:
   int min_field_width;
 {
 private:
   int min_field_width;


@@ -752,7 +753,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP Integer_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Integer_Field : public NCursesFieldType

 {
 private:
   int precision;
 {
 private:
   int precision;


@@ -770,7 +771,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP Numeric_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Numeric_Field : public NCursesFieldType

 {
 private:
   int precision;
 {
 private:
   int precision;


@@ -788,7 +789,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP Regular_Expression_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Regular_Expression_Field : public NCursesFieldType

 {
 private:
   char* regex;
 {
 private:
   char* regex;


@@ -833,7 +834,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP Enumeration_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP Enumeration_Field : public NCursesFieldType

 {
 private:
   const char** list;
 {
 private:
   const char** list;


@@ -872,7 +873,7 @@ public:
   }
 };
 
   }
 };
 

-class NCURSES_IMPEXP IPV4_Address_Field : public NCursesFieldType
+class NCURSES_CXX_IMPEXP IPV4_Address_Field : public NCursesFieldType

 {
 private:
   void set(NCursesFormField& f) {
 {
 private:
   void set(NCursesFormField& f) {


@@ -895,7 +896,7 @@ extern "C" {
 // Abstract base class for User-Defined Fieldtypes
 // -------------------------------------------------------------------------
 //
 // Abstract base class for User-Defined Fieldtypes
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP UserDefinedFieldType : public NCursesFieldType
+class NCURSES_CXX_IMPEXP UserDefinedFieldType : public NCursesFieldType

 {
   friend class UDF_Init; // Internal helper to set up statics
 private:
 {
   friend class UDF_Init; // Internal helper to set up statics
 private:


@@ -924,8 +925,7 @@ protected:
   virtual bool char_check (int c) = 0;
 
 public:
   virtual bool char_check (int c) = 0;
 
 public:

-  UserDefinedFieldType() : NCursesFieldType(generic_fieldtype) {
-  }
+  UserDefinedFieldType();

 };
 
 extern "C" {
 };
 
 extern "C" {


@@ -938,7 +938,7 @@ extern "C" {
 // Abstract base class for User-Defined Fieldtypes with Choice functions
 // -------------------------------------------------------------------------
 //
 // Abstract base class for User-Defined Fieldtypes with Choice functions
 // -------------------------------------------------------------------------
 //

-class NCURSES_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType
+class NCURSES_CXX_IMPEXP UserDefinedFieldType_With_Choice : public UserDefinedFieldType

 {
   friend class UDF_Init; // Internal helper to set up statics
 private:
 {
   friend class UDF_Init; // Internal helper to set up statics
 private:


@@ -961,9 +961,7 @@ protected:
   virtual bool previous(NCursesFormField& f) = 0;
 
 public:
   virtual bool previous(NCursesFormField& f) = 0;
 
 public:

-  UserDefinedFieldType_With_Choice() {
-    fieldtype = generic_fieldtype_with_choice;
-  }
+  UserDefinedFieldType_With_Choice();

 };
 
 #endif /* NCURSES_CURSESF_H_incl */
 };
 
 #endif /* NCURSES_CURSESF_H_incl */