ncurses 6.0 - patch 20150822

[ncurses.git] / Ada95 / src / terminal_interface-curses-menus-menu_user_data.adb

diff --git a/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb b/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb
index 20b9e8665ac8142bf1ec55b20d4775249b5f0257..746e7b41555a524613e9d6e6cd10f0e5a85fffab 100644 (file)
--- a/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb
+++ b/Ada95/src/terminal_interface-curses-menus-menu_user_data.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------

--- Copyright (c) 1998 Free Software Foundation, Inc.                        --
+-- Copyright (c) 1998-2009,2014 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,7 +35,7 @@
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:
 ------------------------------------------------------------------------------
 --  Author:  Juergen Pfeifer, 1996
 --  Version Control:

---  $Revision: 1.12 $
+--  $Revision: 1.15 $

 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;


@@ -44,21 +44,19 @@ package body Terminal_Interface.Curses.Menus.Menu_User_Data is
 
    use type Interfaces.C.int;
 
 
    use type Interfaces.C.int;
 

-   procedure Set_User_Data (Men  : in Menu;
-                            Data : in User_Access)
+   procedure Set_User_Data (Men  : Menu;
+                            Data : User_Access)

    is
       function Set_Menu_Userptr (Men  : Menu;
    is
       function Set_Menu_Userptr (Men  : Menu;

-                                 Data : User_Access)  return C_Int;
+                                 Data : User_Access)  return Eti_Error;

       pragma Import (C, Set_Menu_Userptr, "set_menu_userptr");
 
       pragma Import (C, Set_Menu_Userptr, "set_menu_userptr");
 

-      Res : constant Eti_Error := Set_Menu_Userptr (Men, Data);

    begin
    begin

-      if  Res /= E_Ok then
-         Eti_Exception (Res);
-      end if;
+      Eti_Exception (Set_Menu_Userptr (Men, Data));
+

    end Set_User_Data;
 
    end Set_User_Data;
 

-   function Get_User_Data (Men  : in  Menu) return User_Access
+   function Get_User_Data (Men  : Menu) return User_Access

    is
       function Menu_Userptr (Men : Menu) return User_Access;
       pragma Import (C, Menu_Userptr, "menu_userptr");
    is
       function Menu_Userptr (Men : Menu) return User_Access;
       pragma Import (C, Menu_Userptr, "menu_userptr");


@@ -66,7 +64,7 @@ package body Terminal_Interface.Curses.Menus.Menu_User_Data is
       return Menu_Userptr (Men);
    end Get_User_Data;
 
       return Menu_Userptr (Men);
    end Get_User_Data;
 

-   procedure Get_User_Data (Men  : in  Menu;
+   procedure Get_User_Data (Men  : Menu;

                             Data : out User_Access)
    is
    begin
                             Data : out User_Access)
    is
    begin