ncurses 5.9 - patch 20140426

[ncurses.git] / Ada95 / samples / sample-function_key_setting.adb

diff --git a/Ada95/samples/sample-function_key_setting.adb b/Ada95/samples/sample-function_key_setting.adb
index 9c7a31e8e38860a2bd8ce9d3c2a5d8e956511e56..4ff70be7bb8aa768d691d353db7a8cbf5dc97319 100644 (file)
--- a/Ada95/samples/sample-function_key_setting.adb
+++ b/Ada95/samples/sample-function_key_setting.adb
@@ -7,7 +7,7 @@
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------
 --                                 B O D Y                                  --
 --                                                                          --
 ------------------------------------------------------------------------------

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

---  $Revision: 1.10 $
+--  $Revision: 1.15 $
+--  $Date: 2011/03/23 00:44:12 $

 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Deallocation;
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Deallocation;


@@ -80,25 +81,25 @@ package body Sample.Function_Key_Setting is
 
    Top_Of_Stack : Env_Ptr := null;
 
 
    Top_Of_Stack : Env_Ptr := null;
 

-   procedure Push_Environment (Key   : in String;
-                               Reset : in Boolean := True)
+   procedure Push_Environment (Key   : String;
+                               Reset : Boolean := True)

    is
       P : constant Env_Ptr := new Key_Environment (Number_Of_Keys);
    begin
       --  Store the current labels in the environment
       for I in 1 .. Number_Of_Keys loop
    is
       P : constant Env_Ptr := new Key_Environment (Number_Of_Keys);
    begin
       --  Store the current labels in the environment
       for I in 1 .. Number_Of_Keys loop

-         Get_Soft_Label_Key (I, P.Labels (I));
+         Get_Soft_Label_Key (I, P.all.Labels (I));

          if Reset then
             Set_Soft_Label_Key (I, " ");
          end if;
       end loop;
          if Reset then
             Set_Soft_Label_Key (I, " ");
          end if;
       end loop;

-      P.Prev := Top_Of_Stack;
+      P.all.Prev := Top_Of_Stack;

       --  now store active help context and notepad
       --  now store active help context and notepad

-      P.Help := Active_Context;
-      P.Notepad := Active_Notepad;
+      P.all.Help := Active_Context;
+      P.all.Notepad := Active_Notepad;

       --  The notepad must now vanish and the new notepad is empty.
       --  The notepad must now vanish and the new notepad is empty.

-      if (P.Notepad /= Null_Panel) then
-         Hide (P.Notepad);
+      if P.all.Notepad /= Null_Panel then
+         Hide (P.all.Notepad);

          Update_Panels;
       end if;
       Active_Notepad := Null_Panel;
          Update_Panels;
       end if;
       Active_Notepad := Null_Panel;


@@ -118,14 +119,14 @@ package body Sample.Function_Key_Setting is
          raise Function_Key_Stack_Error;
       else
          for I in 1 .. Number_Of_Keys loop
          raise Function_Key_Stack_Error;
       else
          for I in 1 .. Number_Of_Keys loop

-            Set_Soft_Label_Key (I, P.Labels (I), Justification);
+            Set_Soft_Label_Key (I, P.all.Labels (I), Justification);

          end loop;
          pragma Assert (Active_Context /= null);
          Release_String (Active_Context);
          end loop;
          pragma Assert (Active_Context /= null);
          Release_String (Active_Context);

-         Active_Context := P.Help;
+         Active_Context := P.all.Help;

          Refresh_Soft_Label_Keys_Without_Update;
          Refresh_Soft_Label_Keys_Without_Update;

-         Notepad_To_Context (P.Notepad);
-         Top_Of_Stack := P.Prev;
+         Notepad_To_Context (P.all.Notepad);
+         Top_Of_Stack := P.all.Prev;

          Release_Environment (P);
       end if;
    end Pop_Environment;
          Release_Environment (P);
       end if;
    end Pop_Environment;


@@ -149,17 +150,17 @@ package body Sample.Function_Key_Setting is
       else
          loop
             exit when P = null;
       else
          loop
             exit when P = null;

-            if P.Help.all = Key then
+            if P.all.Help.all = Key then

                return True;
             else
                return True;
             else

-               P := P.Prev;
+               P := P.all.Prev;

             end if;
          end loop;
          return False;
       end if;
    end Find_Context;
 
             end if;
          end loop;
          return False;
       end if;
    end Find_Context;
 

-   procedure Notepad_To_Context (Pan : in Panel)
+   procedure Notepad_To_Context (Pan : Panel)

    is
       W : Window;
    begin
    is
       W : Window;
    begin