X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=doc%2Fhtml%2Fada%2Fterminal_interface-curses-forms-field_types-user__adb.htm;h=ed3a5e1baa9d158d1e2137f48681cf07ba96238f;hb=29ee95cea37c4bbf2014a35677d9a0750c6b52a8;hp=26fa221d0206653e69714735bdd4bba7f6c0e04c;hpb=77afe78361875f531dc2bf8d73f2e781c8e76176;p=ncurses.git
diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm
index 26fa221d..ed3a5e1b 100644
--- a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm
@@ -12,7 +12,7 @@
-- B O D Y --
-- --
------------------------------------------------------------------------------
--- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2009,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 --
@@ -40,11 +40,11 @@
------------------------------------------------------------------------------
-- Author: Juergen Pfeifer, 1996
-- Version Control:
--- @Revision: 1.16 @
--- @Date: 2009/12/26 17:38:58 @
+-- @Revision: 1.21 @
+-- @Date: 2011/03/23 00:44:58 @
-- Binding Version 01.00
------------------------------------------------------------------------------
-with Ada.Unchecked_Conversion;
+with System.Address_To_Access_Conversions;
with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
package body Terminal_Interface.Curses.Forms.Field_Types.User is
@@ -59,7 +59,7 @@
Cft : C_Field_Type := C_Generic_Type;
Arg1 : Argument_Access)
return C_Int;
- pragma Import (C, Set_Fld_Type, "set_field_type");
+ pragma Import (C, Set_Fld_Type, "set_field_type_user");
Res : Eti_Error;
@@ -81,31 +81,31 @@
end if;
end Set_Field_Type;
- pragma Warnings (Off);
- function To_Argument_Access is new Ada.Unchecked_Conversion
- (System.Address, Argument_Access);
- pragma Warnings (On);
+ package Argument_Conversions is
+ new System.Address_To_Access_Conversions (Argument);
- function Generic_Field_Check (Fld : Field;
- Usr : System.Address) return C_Int
+ function Generic_Field_Check (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_Access :=
- User_Defined_Field_Type_Access (To_Argument_Access (Usr).Typ);
+ Result : Boolean;
+ Udf : constant User_Defined_Field_Type_Access :=
+ User_Defined_Field_Type_Access
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
begin
- Result := Field_Check (Fld, Udf.all);
- return C_Int (Boolean'Pos (Result));
+ Result := Field_Check (Fld, Udf.all);
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Field_Check;
- function Generic_Char_Check (Ch : C_Int;
- Usr : System.Address) return C_Int
+ function Generic_Char_Check (Ch : C_Int;
+ Usr : System.Address) return Curses_Bool
is
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_Access :=
- User_Defined_Field_Type_Access (To_Argument_Access (Usr).Typ);
+ Result : Boolean;
+ Udf : constant User_Defined_Field_Type_Access :=
+ User_Defined_Field_Type_Access
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
begin
- Result := Character_Check (Character'Val (Ch), Udf.all);
- return C_Int (Boolean'Pos (Result));
+ Result := Character_Check (Character'Val (Ch), Udf.all);
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Char_Check;
-- -----------------------------------------------------------------------
@@ -119,7 +119,7 @@
T := New_Fieldtype (Generic_Field_Check'Access,
Generic_Char_Check'Access);
if T = Null_Field_Type then
- raise Form_Exception;
+ raise Form_Exception;
else
Res := Set_Fieldtype_Arg (T,
Make_Arg'Access,