ncurses 6.2 - patch 20200808

[ncurses.git] / Ada95 / samples / ncurses2-util.adb

diff --git a/Ada95/samples/ncurses2-util.adb b/Ada95/samples/ncurses2-util.adb
index 3e88ea8b001ccf49583ec77faf982c222ef6a398..152a5d3777af385591b8af6615fb6bbcd9480a07 100644 (file)
--- a/Ada95/samples/ncurses2-util.adb
+++ b/Ada95/samples/ncurses2-util.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000,2004 Free Software Foundation, Inc.                   --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2008,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            --
@@ -35,23 +36,14 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.5 $
---  $Date: 2004/08/21 21:37:00 $
+--  $Revision: 1.10 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses; use Terminal_Interface.Curses;
-
-with Ada.Text_IO;
-
-with Terminal_Interface.Curses; use Terminal_Interface.Curses;
-pragma Warnings (Off);
-with Terminal_Interface.Curses.Aux;
-pragma Warnings (On);
+with Ada.Text_IO; use Ada.Text_IO;
 
 with Terminal_Interface.Curses.Trace; use Terminal_Interface.Curses.Trace;
 
-with Ada.Text_IO; use Ada.Text_IO;
-
 with Interfaces.C;
 with Interfaces.C.Strings;
 
@@ -59,7 +51,6 @@ with Ada.Characters.Handling;
 
 with ncurses2.genericPuts;
 
-
 package body ncurses2.util is
 
    --  #defines from C
@@ -111,7 +102,6 @@ package body ncurses2.util is
       end if;
    end Getchar;
 
-
    procedure Pause is
    begin
       Move_Cursor (Line => Lines - 1, Column => 0);
@@ -119,11 +109,9 @@ package body ncurses2.util is
       Getchar;
    end Pause;
 
-
    procedure Cannot (s : String) is
       use Interfaces.C;
       use Interfaces.C.Strings;
-      use Terminal_Interface.Curses.Aux;
       function getenv (x : char_array)  return chars_ptr;
       pragma Import (C, getenv, "getenv");
       tmp1 : char_array (0 .. 10);
@@ -163,8 +151,6 @@ package body ncurses2.util is
       Refresh;
    end ShellOut;
 
-
-
    function Is_Digit (c : Key_Code) return Boolean is
    begin
       if c >= 16#100# then
@@ -180,7 +166,6 @@ package body ncurses2.util is
       Add (Ch => newl);
    end P;
 
-
    function Code_To_Char (c : Key_Code) return Character is
    begin
       if c > Character'Pos (Character'Last) then