X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fgen%2Fterminal_interface-curses-forms-field_types.ads.m4;h=36314012ed9b4d075464abfd0f3baf1f2cbbad5d;hp=79e185a1e7c690367768fc88308420cd51b0e5fd;hb=677412a37f53a465b9b127843d4aa070077659e8;hpb=661078ddbde3ce0f3b06e95642fbb9b5fef7dca1

diff --git a/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 b/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
index 79e185a1..36314012 100644
--- a/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
+++ b/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4
@@ -1,5 +1,5 @@
 --  -*- ada -*-
-define(`HTMLNAME',`terminal_interface-curses-forms-field_user_data_s.html')dnl
+define(`HTMLNAME',`terminal_interface-curses-forms-field_user_data__ads.htm')dnl
 include(M4MACRO)dnl
 ------------------------------------------------------------------------------
 --                                                                          --
@@ -10,7 +10,7 @@ include(M4MACRO)dnl
 --                                 S P E C                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 1998 Free Software Foundation, Inc.                        --
+-- Copyright (c) 1998-2003,2009 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            --
@@ -36,15 +36,17 @@ include(M4MACRO)dnl
 -- sale, use or other dealings in this Software without prior written       --
 -- authorization.                                                           --
 ------------------------------------------------------------------------------
---  Author: Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> 1996
+--  Author:  Juergen Pfeifer, 1996
 --  Version Control:
---  $Revision: 1.6 $
---  Binding Version 00.93
+--  $Revision: 1.15 $
+--  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses.Aux;
+with Interfaces.C;
 
 package Terminal_Interface.Curses.Forms.Field_Types is
-   pragma Preelaborate (Field_Types);
+   pragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types);
+   use type Interfaces.C.int;
+   subtype C_Int is Interfaces.C.int;
 
    --  MANPAGE(`form_fieldtype.3x')
 
@@ -62,8 +64,8 @@ package Terminal_Interface.Curses.Forms.Field_Types is
    type Field_Type_Access is access all Field_Type'Class;
 
    --  ANCHOR(`set_field_type()',`Set_Type')
-   procedure Set_Field_Type (Fld      : in Field;
-                             Fld_Type : in Field_Type) is abstract;
+   procedure Set_Field_Type (Fld      : Field;
+                             Fld_Type : Field_Type) is abstract;
    --  AKA
    --  But: we hide the vararg mechanism of the C interface. You always
    --       have to pass a single Field_Type parameter.
@@ -73,7 +75,7 @@ package Terminal_Interface.Curses.Forms.Field_Types is
    --  MANPAGE(`form_field_validation.3x')
 
    --  ANCHOR(`field_type()',`Get_Type')
-   function Get_Type (Fld : in Field) return Field_Type_Access;
+   function Get_Type (Fld : Field) return Field_Type_Access;
    --  AKA
    --  ALIAS(`field_arg()')
    --  In Ada95 we can combine these. If you try to retrieve the field type
@@ -86,8 +88,6 @@ package Terminal_Interface.Curses.Forms.Field_Types is
    --  | Most of this is used by the implementations of the child packages.
    --  |
 private
-   use Terminal_Interface.Curses.Aux;
-
    type Makearg_Function is access
      function (Args : System.Address) return System.Address;
    pragma Convention (C, Makearg_Function);
@@ -117,8 +117,8 @@ private
    --  |
    type Low_Level_Field_Type is
       record
-         Status :              C_Short;
-         Ref_Count :           C_Long_Int;
+         Status :              Interfaces.C.short;
+         Ref_Count :           Interfaces.C.long;
          Left, Right :         System.Address;
          Makearg :             Makearg_Function;
          Copyarg :             Copyarg_Function;