X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=Ada95%2Fsamples%2Fncurses2-demo_pad.adb;h=86bfb2d689d92210206a7a9f8f3db83449587a4e;hb=1f7a36fe16b11bb4aab51be89bbc1b0f75936b78;hp=862b8b70da296381bd03326d43808e5dc2f12d43;hpb=4c309ad3b124eff80aa6b54018b5cc9f1e3d116d;p=ncurses.git

diff --git a/Ada95/samples/ncurses2-demo_pad.adb b/Ada95/samples/ncurses2-demo_pad.adb
index 862b8b70..86bfb2d6 100644
--- a/Ada95/samples/ncurses2-demo_pad.adb
+++ b/Ada95/samples/ncurses2-demo_pad.adb
@@ -7,7 +7,8 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
--- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc.              --
+-- Copyright 2020 Thomas E. Dickey                                          --
+-- Copyright 2000-2011,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,8 +36,8 @@
 ------------------------------------------------------------------------------
 --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
 --  Version Control
---  $Revision: 1.7 $
---  $Date: 2008/07/26 18:47:06 $
+--  $Revision: 1.11 $
+--  $Date: 2020/02/02 23:34:34 $
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with ncurses2.util; use ncurses2.util;
@@ -121,8 +122,8 @@ procedure ncurses2.demo_pad is
          retval.seconds := 0;
          retval.microseconds := 0;
       else
-         retval.seconds := Integer (t.tv_sec);
-         retval.microseconds := Integer (t.tv_usec);
+         retval.seconds := Integer (t.all.tv_sec);
+         retval.microseconds := Integer (t.all.tv_usec);
       end if;
       return retval;
    end gettime;
@@ -437,7 +438,8 @@ procedure ncurses2.demo_pad is
                --  pan rightwards
                --  if (basex + portx - (pymax > porty) < pxmax)
                if basex + portx -
-                   Column_Position (greater (pymax, porty)) < pxmax then
+                   Column_Position (greater (pymax, porty)) < pxmax
+               then
                   --  if basex + portx  < pxmax or
                   --      (pymax > porty and basex + portx - 1 < pxmax) then
                   basex := basex + 1;
@@ -457,7 +459,8 @@ procedure ncurses2.demo_pad is
                --  pan downwards
                --  same as if (basey + porty - (pxmax > portx) < pymax)
                if basey + porty -
-                   Line_Position (greater (pxmax, portx)) < pymax then
+                   Line_Position (greater (pxmax, portx)) < pymax
+               then
                   --  if (basey + porty  < pymax) or
                   --      (pxmax > portx and basey + porty - 1 < pymax) then
                   basey := basey + 1;
@@ -486,7 +489,7 @@ procedure ncurses2.demo_pad is
          --  more writing off the screen.
          --  Interestingly, the exception is not handled if
          --  we put a block around this.
-         --  delcare --begin
+         --  declare --begin
          if top_y /= 0 and top_x /= 0 then
             Add (Line => top_y - 1, Column => top_x - 1,
                  Ch => ACS_Map (ACS_Upper_Left_Corner));
@@ -577,7 +580,7 @@ procedure ncurses2.demo_pad is
 
          declare
             --  the C version allows the panel to have a zero height
-            --  wich raise the exception
+            --  which raise the exception
          begin
             Refresh_Without_Update
               (