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=2abd20d10bf73f344f980e2665742fc196fb5101;hp=0761a198eeac312fad80a066f894189d64098519;hb=97cb42f22c43eb31a4bf11475bd73ab0e0b10923;hpb=761e4f0825b330e970558e82a4bd638383914429;ds=sidebyside
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 0761a198..2abd20d1 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
@@ -24,7 +24,7 @@
-
+
@@ -52,69 +52,65 @@
-
-
+
+
with System.Address_To_Access_Conversions;
-with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
+with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
-package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
+package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
package Argument_Conversions is
new System.Address_To_Access_Conversions (Argument);
- function Generic_Next (Fld : Field;
- Usr : System.Address) return Curses_Bool
+ function Generic_Next (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
Result : Boolean;
Udf : constant User_Defined_Field_Type_With_Choice_Access :=
User_Defined_Field_Type_With_Choice_Access
- (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
begin
Result := Next (Fld, Udf.all);
- return Curses_Bool (Boolean'Pos (Result));
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Next;
- function Generic_Prev (Fld : Field;
- Usr : System.Address) return Curses_Bool
+ function Generic_Prev (Fld : Field;
+ Usr : System.Address) return Curses_Bool
is
Result : Boolean;
Udf : constant User_Defined_Field_Type_With_Choice_Access :=
User_Defined_Field_Type_With_Choice_Access
- (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ);
+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ);
begin
Result := Previous (Fld, Udf.all);
- return Curses_Bool (Boolean'Pos (Result));
+ return Curses_Bool (Boolean'Pos (Result));
end Generic_Prev;
function C_Generic_Choice return C_Field_Type
is
- Res : Eti_Error;
+ Res : Eti_Error;
T : C_Field_Type;
begin
if M_Generic_Choice = Null_Field_Type then
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,
Copy_Arg'Access,
Free_Arg'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
- end if;
+ Eti_Exception (Res);
Res := Set_Fieldtype_Choice (T,
Generic_Next'Access,
Generic_Prev'Access);
- if Res /= E_Ok then
- Eti_Exception (Res);
- end if;
+ Eti_Exception (Res);
end if;
M_Generic_Choice := T;
end if;
@@ -122,5 +118,5 @@
return M_Generic_Choice;
end C_Generic_Choice;
-end Terminal_Interface.Curses.Forms.Field_Types.User.Choice;
+end Terminal_Interface.Curses.Forms.Field_Types.User.Choice;