ncurses 6.2 - patch 20200725

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

diff --git a/c++/cursesf.cc b/c++/cursesf.cc
index 7956054769f4c9e70808199ece62b311a16b2090..fcf0080f9db5bfd1cdade3b4fa72a3455ccad2f5 100644 (file)
--- a/c++/cursesf.cc
+++ b/c++/cursesf.cc
@@ -1,6 +1,7 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2005,2011 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,9 +36,9 @@
 #include "cursesf.h"
 #include "cursesapp.h"
 
 #include "cursesf.h"
 #include "cursesapp.h"
 

-MODULE_ID("$Id: cursesf.cc,v 1.22 2011/09/17 22:12:10 tom Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.25 2020/07/18 19:57:11 anonymous.maarten Exp $")

 
 

-NCursesFormField::~NCursesFormField ()
+NCursesFormField::~NCursesFormField () THROWS(NCursesException)

 {
   if (field)
     OnError(::free_field (field));
 {
   if (field)
     OnError(::free_field (field));


@@ -149,7 +150,7 @@ NCursesForm::InitForm(NCursesFormField* nfields[],
   setDefaultAttributes();
 }
 
   setDefaultAttributes();
 }
 

-NCursesForm::~NCursesForm()
+NCursesForm::~NCursesForm() THROWS(NCursesException)

 {
   UserHook* hook = reinterpret_cast<UserHook*>(::form_userptr(form));
   delete hook;
 {
   UserHook* hook = reinterpret_cast<UserHook*>(::form_userptr(form));
   delete hook;


@@ -405,10 +406,19 @@ FIELDTYPE* UserDefinedFieldType::generic_fieldtype =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 

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

 FIELDTYPE* UserDefinedFieldType_With_Choice::generic_fieldtype_with_choice =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 
 FIELDTYPE* UserDefinedFieldType_With_Choice::generic_fieldtype_with_choice =
   ::new_fieldtype(_nc_xx_fld_fcheck,
                  _nc_xx_fld_ccheck);
 

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

 bool _nc_xx_next_choice(FIELD *f, const void *u)
 {
   (void) f;
 bool _nc_xx_next_choice(FIELD *f, const void *u)
 {
   (void) f;


@@ -460,3 +470,5 @@ public:
 };
 
 UDF_Init* UDF_Init::I = new UDF_Init();
 };
 
 UDF_Init* UDF_Init::I = new UDF_Init();

+
+