X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=doc%2Fhtml%2Fada%2Fterminal_interface-curses-forms-field_types-user-choice__adb.htm;h=018a19ddfa645b406f0fa1c9beab06b4a99e3c3d;hp=170de3c88836f957fc7ed8ed332ccf8b4f81a72a;hb=2403eaecbe5b488358485a3deb351ab552af8791;hpb=f6718d80c998008de6cfe8e6296bee3958ff86d7
diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm
index 170de3c8..018a19dd 100644
--- a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm
+++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm
@@ -12,7 +12,7 @@
-- B O D Y --
-- --
------------------------------------------------------------------------------
--- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2008,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,73 +40,71 @@
------------------------------------------------------------------------------
-- Author: Juergen Pfeifer, 1996
-- Version Control:
--- @Revision: 1.15 @
--- @Date: 2008/07/26 18:48:58 @
+-- @Revision: 1.17 @
+-- @Date: 2011/03/22 10:53:37 @
-- 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.Choice is
- 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_Next (Fld : Field;
- Usr : System.Address) return C_Int
+ function Generic_Next (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_With_Choice_Access :=
+ Result : Boolean;
+ Udf : constant User_Defined_Field_Type_With_Choice_Access :=
User_Defined_Field_Type_With_Choice_Access
- (To_Argument_Access (Usr).Typ);
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
begin
- Result := Next (Fld, Udf.all);
- return C_Int (Boolean'Pos (Result));
+ Result := Next (Fld, Udf.all);
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Next;
- function Generic_Prev (Fld : Field;
- Usr : System.Address) return C_Int
+ function Generic_Prev (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
- Result : Boolean;
- Udf : constant User_Defined_Field_Type_With_Choice_Access :=
+ Result : Boolean;
+ Udf : constant User_Defined_Field_Type_With_Choice_Access :=
User_Defined_Field_Type_With_Choice_Access
- (To_Argument_Access (Usr).Typ);
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
begin
- Result := Previous (Fld, Udf.all);
- return C_Int (Boolean'Pos (Result));
+ Result := Previous (Fld, Udf.all);
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Prev;
-- -----------------------------------------------------------------------
--
- function C_Generic_Choice return C_Field_Type
+ function C_Generic_Choice return C_Field_Type
is
- Res : Eti_Error;
- T : C_Field_Type;
+ Res : Eti_Error;
+ T : C_Field_Type;
begin
if M_Generic_Choice = Null_Field_Type then
- T := New_Fieldtype (Generic_Field_Check'Access,
+ T := New_Fieldtype (Generic_Field_Check'Access,
Generic_Char_Check'Access);
- if T = Null_Field_Type then
- raise Form_Exception;
+ if T = Null_Field_Type then
+ raise Form_Exception;
else
- Res := Set_Fieldtype_Arg (T,
+ Res := Set_Fieldtype_Arg (T,
Make_Arg'Access,
Copy_Arg'Access,
Free_Arg'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
- Res := Set_Fieldtype_Choice (T,
+ Res := Set_Fieldtype_Choice (T,
Generic_Next'Access,
Generic_Prev'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
+ if Res /= E_Ok then
+ Eti_Exception (Res);
end if;
end if;
- M_Generic_Choice := T;
+ M_Generic_Choice := T;
end if;
pragma Assert (M_Generic_Choice /= Null_Field_Type);
return M_Generic_Choice;