ncurses 6.1 - patch 20180707

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

diff --git a/Ada95/samples/ncurses2-m.adb b/Ada95/samples/ncurses2-m.adb
index 20ab72136e3fc9f06cb2b71241975718421a7948..7ce969ce278d981a6958b324b6d587370adfe720 100644 (file)
--- a/Ada95/samples/ncurses2-m.adb
+++ b/Ada95/samples/ncurses2-m.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------

--- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc.              --
+-- Copyright (c) 2000-2008,2018 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,8 +35,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control

---  $Revision: 1.6 $
---  $Date: 2006/06/25 14:24:40 $
+--  $Revision: 1.9 $
+--  $Date: 2018/07/07 23:33:16 $

 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  TODO use Default_Character where appropriate
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 --  TODO use Default_Character where appropriate


@@ -50,7 +50,6 @@ with Terminal_Interface.Curses.Trace; use Terminal_Interface.Curses.Trace;
 with Ada.Text_IO; use Ada.Text_IO;
 
 with Ada.Characters.Latin_1;
 with Ada.Text_IO; use Ada.Text_IO;
 
 with Ada.Characters.Latin_1;

---  with Ada.Characters.Handling;

 
 with Ada.Command_Line; use Ada.Command_Line;
 
 
 with Ada.Command_Line; use Ada.Command_Line;
 


@@ -64,7 +63,6 @@ with ncurses2.demo_panels;
 with ncurses2.color_edit;
 with ncurses2.slk_test;
 with ncurses2.acs_display;
 with ncurses2.color_edit;
 with ncurses2.slk_test;
 with ncurses2.acs_display;

-with ncurses2.color_edit;

 with ncurses2.acs_and_scroll;
 with ncurses2.flushinp_test;
 with ncurses2.test_sgr_attributes;
 with ncurses2.acs_and_scroll;
 with ncurses2.flushinp_test;
 with ncurses2.test_sgr_attributes;


@@ -77,7 +75,6 @@ with ncurses2.trace_set;
 with ncurses2.getopt; use ncurses2.getopt;
 
 package body ncurses2.m is
 with ncurses2.getopt; use ncurses2.getopt;
 
 package body ncurses2.m is

-   use Int_IO;

 
    function To_trace (n : Integer) return Trace_Attribute_Set;
    procedure usage;
 
    function To_trace (n : Integer) return Trace_Attribute_Set;
    procedure usage;


@@ -305,7 +302,6 @@ package body ncurses2.m is
    tmpi : Integer;
 
    package myio is new Ada.Text_IO.Integer_IO (Integer);
    tmpi : Integer;
 
    package myio is new Ada.Text_IO.Integer_IO (Integer);

-   use myio;

 
    save_trace : Integer := 0;
    save_trace_set : Trace_Attribute_Set;
 
    save_trace : Integer := 0;
    save_trace_set : Trace_Attribute_Set;


@@ -442,6 +438,7 @@ package body ncurses2.m is
 
          exit when command = 'q';
       end loop;
 
          exit when command = 'q';
       end loop;

+      Curses_Free_All;

       return 0; -- TODO ExitProgram(EXIT_SUCCESS);
    end main;
 
       return 0; -- TODO ExitProgram(EXIT_SUCCESS);
    end main;