path: root/devel/adabindx/files/patch-aa

diff -Naur ../adabindx-0.7.2.orig/Local.conf ./Local.conf
--- ../adabindx-0.7.2.orig/Local.conf   Sat Feb  9 14:48:55 2002
+++ ./Local.conf    Thu Dec 26 13:36:40 2002
@@ -43,7 +43,7 @@
 
 # Ada compiler (for gnat this is gcc, sometimes also called gnatgcc)
 #ADA_COMP = gcc
-ADA_COMP = gnatgcc
+ADA_COMP = adagcc
 # compilation flags (I like optimizing)
 ADA_CFLAGS = -c -gnatnv -O3 -mpentium -malign-loops=2 -malign-jumps=2 -malign-functions=2
 # special make command for Ada
diff -Naur ../adabindx-0.7.2.orig/Makefile ./Makefile
--- ../adabindx-0.7.2.orig/Makefile Sun Aug 26 14:46:05 2001
+++ ./Makefile  Thu Dec 26 13:37:07 2002
@@ -21,6 +21,9 @@
        (cd $$i; make all); \
    done
 
+install:
+   make -C lib install
+
 config: Local.conf utils/preprocess utils/islittleend
    @cd lib; \
    if test -f ../config ; \
diff -Naur ../adabindx-0.7.2.orig/examples/actions/Makefile ./examples/actions/Makefile
--- ../adabindx-0.7.2.orig/examples/actions/Makefile    Mon Oct  6 23:26:35 1997
+++ ./examples/actions/Makefile Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: actions
 
 actions: actions.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/clock/Makefile ./examples/clock/Makefile
--- ../adabindx-0.7.2.orig/examples/clock/Makefile  Mon Oct  6 23:27:00 1997
+++ ./examples/clock/Makefile   Thu Dec 26 13:36:40 2002
@@ -12,7 +12,7 @@
 all: clock
 
 clock: clock.adb clock_global.ads clock_global.adb fallback.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 fallback.ads: AdaClock.ad
    ../../utils/makefallb AdaClock.ad > $@
diff -Naur ../adabindx-0.7.2.orig/examples/dig_clock/Makefile ./examples/dig_clock/Makefile
--- ../adabindx-0.7.2.orig/examples/dig_clock/Makefile  Sat Mar  2 13:49:14 2002
+++ ./examples/dig_clock/Makefile   Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: dig_clock
 
 dig_clock: dig_clock.adb dig_clock_global.adb  dig_clock_global.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XPM_LIB)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XPM_LIB) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/display_info/Makefile ./examples/display_info/Makefile
--- ../adabindx-0.7.2.orig/examples/display_info/Makefile   Mon Oct  6 23:27:26 1997
+++ ./examples/display_info/Makefile    Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: display_info
 
 display_info: display_info.adb bubble_sort.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/hello_world/Makefile ./examples/hello_world/Makefile
--- ../adabindx-0.7.2.orig/examples/hello_world/Makefile    Fri Apr  3 23:20:32 1998
+++ ./examples/hello_world/Makefile Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: hello_world
 
 hello_world: hello_world.adb hello_world_global.ads hello_world_global.adb earth.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XMU_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XMU_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/i18n/Makefile ./examples/i18n/Makefile
--- ../adabindx-0.7.2.orig/examples/i18n/Makefile   Sun Feb  1 17:57:07 1998
+++ ./examples/i18n/Makefile    Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: i18n
 
 i18n: i18n.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/image/Makefile ./examples/image/Makefile
--- ../adabindx-0.7.2.orig/examples/image/Makefile  Mon Oct  6 23:27:56 1997
+++ ./examples/image/Makefile   Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: image
 
 image: common.ads image.adb image_global.adb image_global.ads motif_graphics.adb motif_graphics.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/mandel/Makefile ./examples/mandel/Makefile
--- ../adabindx-0.7.2.orig/examples/mandel/Makefile Sun Feb  3 18:05:55 2002
+++ ./examples/mandel/Makefile  Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: mandel
 
 mandel: mandel.adb mandel_global.ads mandel_global.adb fallback.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/rotate_arrow/Makefile ./examples/rotate_arrow/Makefile
--- ../adabindx-0.7.2.orig/examples/rotate_arrow/Makefile   Mon Oct  6 23:28:59 1997
+++ ./examples/rotate_arrow/Makefile    Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: rotate_arrow
 
 rotate_arrow: rotate_arrow.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/show_extensions/Makefile ./examples/show_extensions/Makefile
--- ../adabindx-0.7.2.orig/examples/show_extensions/Makefile    Sat Feb  9 14:11:01 2002
+++ ./examples/show_extensions/Makefile Thu Dec 26 13:36:40 2002
@@ -12,7 +12,7 @@
 all: show_extensions
 
 show_extensions: show_extensions.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I../generic -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I../generic -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/show_hosts/Makefile ./examples/show_hosts/Makefile
--- ../adabindx-0.7.2.orig/examples/show_hosts/Makefile Sat Oct 10 18:46:06 1998
+++ ./examples/show_hosts/Makefile  Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 SRCS = show_hosts.adb
 
 all:
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/show_printers/Makefile ./examples/show_printers/Makefile
--- ../adabindx-0.7.2.orig/examples/show_printers/Makefile  Sat Mar  2 14:14:39 2002
+++ ./examples/show_printers/Makefile   Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 SRCS = show_printers.adb
 
 all: show_printers.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XP_LIB) $(XEXT_LIB) $(X_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XP_LIB) $(XEXT_LIB) $(X_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/show_screen_saver/Makefile ./examples/show_screen_saver/Makefile
--- ../adabindx-0.7.2.orig/examples/show_screen_saver/Makefile  Mon Oct  6 23:29:51 1997
+++ ./examples/show_screen_saver/Makefile   Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: show_screen_saver
 
 show_screen_saver: show_screen_saver.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/testpath/Makefile ./examples/testpath/Makefile
--- ../adabindx-0.7.2.orig/examples/testpath/Makefile   Sun Feb  8 19:56:57 1998
+++ ./examples/testpath/Makefile    Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: testpath
 
 testpath: testpath.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/xau_test/Makefile ./examples/xau_test/Makefile
--- ../adabindx-0.7.2.orig/examples/xau_test/Makefile   Sun Jan 10 19:52:00 1999
+++ ./examples/xau_test/Makefile    Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 SRCS = xau_test.adb
 
 all:
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XAU_LIBS) $(X_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XAU_LIBS) $(X_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/xlib_rubik/Makefile ./examples/xlib_rubik/Makefile
--- ../adabindx-0.7.2.orig/examples/xlib_rubik/Makefile Mon Oct  6 23:30:05 1997
+++ ./examples/xlib_rubik/Makefile  Thu Dec 26 13:36:40 2002
@@ -29,7 +29,7 @@
 all: xlib_rubik
 
 xlib_rubik: $(SOURCES)
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/xmmore/Makefile ./examples/xmmore/Makefile
--- ../adabindx-0.7.2.orig/examples/xmmore/Makefile Sun Jan 20 21:31:19 2002
+++ ./examples/xmmore/Makefile  Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: xmmore
 
 xmmore: fallback.ads  xmmore.adb  xmmore_global.adb  xmmore_global.ads
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/examples/xpminfo/Makefile ./examples/xpminfo/Makefile
--- ../adabindx-0.7.2.orig/examples/xpminfo/Makefile    Mon Oct  6 23:30:33 1997
+++ ./examples/xpminfo/Makefile Thu Dec 26 13:36:40 2002
@@ -11,7 +11,7 @@
 all: xpminfo
 
 xpminfo: xpminfo.adb
-   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XPM_LIB) $(XT_LIBS)
+   $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XPM_LIB) $(XT_LIBS) $(ADABINDX_LIBS)
 
 clean:
    $(RM) *.ali *.o
diff -Naur ../adabindx-0.7.2.orig/lib/Makefile ./lib/Makefile
--- ../adabindx-0.7.2.orig/lib/Makefile Sun Aug 26 17:26:39 2001
+++ ./lib/Makefile  Thu Dec 26 13:37:20 2002
@@ -67,6 +67,10 @@
 # source solely for Motif2.0
 XM20_BIND_SRC = xm_widgets-primitive-cs_text.adb
 
+# source for Motif2.2
+XM22_BIND_SRC = xm_widgets-manager-bulletin_board-column.adb \
+               xm_widgets-primitive-text-data_field.adb
+
 XPM_BIND_SRC = xpm_lib.adb
 
 X63_BIND_SRC = x_lib-extensions-print.adb
@@ -108,7 +112,7 @@
    do \
        $(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
    done
-   @if test -n "$(IS_MOTIF21)" -o -n "$(IS_MOTIF20)" ; \
+   @if test -n "$(IS_OPENMOTIF22)" -o -n "$(IS_MOTIF21)" -o -n "$(IS_MOTIF20)" ; \
    then \
        for i in $(XM2X_BIND_SRC); \
        do \
@@ -120,7 +124,14 @@
            do \
                $(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
            done; \
-       fi \
+       fi; \
+       if test -n "$(IS_OPENMOTIF22)" ; \
+       then \
+           for i in $(XM22_BIND_SRC); \
+           do \
+               $(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
+           done; \
+       fi; \
    fi
    @if test -n "$(HAS_XPM)" ; \
    then \
@@ -129,12 +140,21 @@
            $(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
        done \
    fi
+   ar -r libadabindx.a *.o
 
 i-cwstri.o: i-cwstri.ads i-cwstri.adb
    $(ADA_COMP) $(ADA_CFLAGS) -gnatg i-cwstri.adb
 
 i-csstli.o: i-csstli.ads i-csstli.adb
    $(ADA_COMP) $(ADA_CFLAGS) -gnatg i-csstli.adb
+
+install: ../lib
+   rm -rf $(PREFIX)/lib/adabindx
+   rm -f $(PREFIX)/lib/libadabindx.a
+   mkdir $(PREFIX)/lib/adabindx
+   cp *.ad[sb] $(PREFIX)/lib/adabindx
+   cp libadabindx.a $(PREFIX)/lib
+   cp *.ali $(PREFIX)/lib/adabindx
 
 clean:
 
diff -Naur ../adabindx-0.7.2.orig/lib/x_toolkit.ads ./lib/x_toolkit.ads
--- ../adabindx-0.7.2.orig/lib/x_toolkit.ads    Sat Mar  2 12:17:16 2002
+++ ./lib/x_toolkit.ads Thu Dec 26 13:36:40 2002
@@ -1446,10 +1446,34 @@
                          Name  : in     Xt_N_Resource_String;
                          Value : in     Xt_Accelerators);
 
+
+   ---------------------------------------------------------------------------
+   --| <Subprogram>
+   --|    <Unit> Append_Get
+   --|    <Purpose> 
+   --|    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Xt_Accelerators);
+   pragma Convention (C, Append_Get);
+
+
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
                          Value : in     Xt_Translations);
 
+
+   ---------------------------------------------------------------------------
+   --| <Subprogram>
+   --|    <Unit> Append_Get
+   --|    <Purpose> 
+   --|    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Xt_Translations);
+   pragma Convention (C, Append_Get);
 
 
    function  Xt_Parse_Translation_Table (Table : in String) return Xt_Translations;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-form.adb ./lib/xm_utilities-form.adb
--- ../adabindx-0.7.2.orig/lib/xm_utilities-form.adb    Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-form.adb Thu Dec 26 13:36:40 2002
@@ -0,0 +1,69 @@
+--  2002-10-07
+with Resource_Strings; use Resource_Strings;
+with X_Toolkit;        use X_Toolkit;
+with Xm_Widgets.Manager.Bulletin_Board.Form;
+use  Xm_Widgets.Manager.Bulletin_Board.Form;
+
+
+package body Xm_Utilities.Form is
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List       : in out Arg_List;
+                         Name       : in     Xt_N_Resource_String;
+                         Attachment : in     Attachment_Type;
+                         W          : in     Widget) is
+   begin
+      if Attachment /= Attach_Widget
+        and Attachment /= Attach_Opposite_Widget
+      then
+         raise Use_Error;
+      end if;
+
+      if Name = Xm_N_Top_Attachment then
+         Append_Set (List, Xm_N_Top_Widget, W);
+      elsif Name = Xm_N_Bottom_Attachment then
+         Append_Set (List, Xm_N_Bottom_Widget, W);
+      elsif Name = Xm_N_Left_Attachment then
+         Append_Set (List, Xm_N_Left_Widget, W);
+      elsif Name = Xm_N_Right_Attachment then
+         Append_Set (List, Xm_N_Right_Widget, W);
+      else
+         raise Use_Error;
+      end if;
+      Append_Set (List, Name, Attachment);
+   end Append_Set;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List       : in out Arg_List;
+                         Name       : in     Xt_N_Resource_String;
+                         Attachment : in     Attachment_Type;
+                         Position   : in     Integer) is
+   begin
+      if Attachment /= Attach_Position then
+         raise Use_Error;
+      end if;
+
+      if Name = Xm_N_Top_Attachment then
+         Append_Set (List, Xm_N_Top_Position, Position);
+      elsif Name = Xm_N_Bottom_Attachment then
+         Append_Set (List, Xm_N_Bottom_Position, Position);
+      elsif Name = Xm_N_Left_Attachment then
+         Append_Set (List, Xm_N_Left_Position, Position);
+      elsif Name = Xm_N_Right_Attachment then
+         Append_Set (List, Xm_N_Right_Position, Position);
+      else
+         raise Use_Error;
+      end if;
+      Append_Set (List, Name, Attachment);
+   end Append_Set;
+
+end Xm_Utilities.Form;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-form.ads ./lib/xm_utilities-form.ads
--- ../adabindx-0.7.2.orig/lib/xm_utilities-form.ads    Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-form.ads Thu Dec 26 13:36:40 2002
@@ -0,0 +1,34 @@
+--  2002-10-07
+with X_Toolkit;
+with Xm_Widgets.Manager.Bulletin_Board.Form;
+
+
+package Xm_Utilities.Form is
+
+   package Xm_Form renames Xm_Widgets.Manager.Bulletin_Board.Form;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List       : in out X_Toolkit.Arg_List;
+                         Name       : in     X_Toolkit.Xt_N_Resource_String;
+                         Attachment : in     Xm_Form.Attachment_Type;
+                         W          : in     X_Toolkit.Widget);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List       : in out X_Toolkit.Arg_List;
+                         Name       : in     X_Toolkit.Xt_N_Resource_String;
+                         Attachment : in     Xm_Form.Attachment_Type;
+                         Position   : in     Integer);
+
+end Xm_Utilities.Form;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-list.adb ./lib/xm_utilities-list.adb
--- ../adabindx-0.7.2.orig/lib/xm_utilities-list.adb    Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-list.adb Thu Dec 26 13:36:40 2002
@@ -0,0 +1,49 @@
+--  2002-10-24
+with X_Toolkit;                 use X_Toolkit;
+with Xm_Widgets;                use Xm_Widgets;
+with Xm_Widgets.Primitive.List; use Xm_Widgets.Primitive.List;
+
+
+package body Xm_Utilities.List is
+
+
+   procedure Format_List (Widgets      : in Widget_List_Type;
+                          String_Table : in Xm_String_Table) is
+      Argl           : Arg_List;
+      Tab_List       : Xm_Tab_List;
+      Render_Table   : Xm_Render_Table;
+      Rendition_List : Xm_Rendition_Array (1 .. 1);
+   begin
+      Tab_List :=
+        Xm_String_Table_Propose_Tablist
+         (String_Table, Widgets (Widgets'First), Float (6.0), Relative);
+
+      Argl := Null_Arg_List;
+      Append_Get (Argl, Xm_N_Render_Table, Render_Table);
+      Xt_Get_Values (Widgets (Widgets'First), Argl);
+
+      Rendition_List (1) :=
+        Xm_Render_Table_Get_Rendition (Render_Table, Motif_Default_Locale);
+
+      Argl := Null_Arg_List;
+      Append_Set (Argl, Xm_N_Tab_List, Tab_List);
+      Xm_Rendition_Update (Rendition_List (1), Argl);
+
+      Render_Table :=
+        Xm_Render_Table_Add_Renditions
+         (Xm_Render_Table_Copy (Render_Table, Null_Xm_String_Tag_Array),
+          Rendition_List, Merge_Replace);
+
+      Argl := Null_Arg_List;
+      Append_Set (Argl, Xm_N_Render_Table, Render_Table);
+      for I in Widgets'Range loop
+         Xt_Set_Values (Widgets (I), Argl);
+      end loop;
+
+      Xm_Render_Table_Free (Render_Table);
+      Xm_Rendition_Free (Rendition_List (1));
+      Xm_Tab_List_Free (Tab_List);
+   end Format_List;
+
+
+end Xm_Utilities.List;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-list.ads ./lib/xm_utilities-list.ads
--- ../adabindx-0.7.2.orig/lib/xm_utilities-list.ads    Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-list.ads Thu Dec 26 13:36:40 2002
@@ -0,0 +1,12 @@
+--  2002-10-24
+with X_Toolkit;
+with Xm_Widgets;
+
+package Xm_Utilities.List is
+
+
+   procedure Format_List (Widgets      : in X_Toolkit.Widget_List_Type;
+                          String_Table : in Xm_Widgets.Xm_String_Table);
+
+
+end Xm_Utilities.List;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.adb ./lib/xm_utilities-protocols.adb
--- ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.adb   Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-protocols.adb    Thu Dec 26 13:36:40 2002
@@ -0,0 +1,27 @@
+--  2002-10-05
+with X_Toolkit;               use X_Toolkit;
+with Xm_Widgets.Atom_Manager; use Xm_Widgets.Atom_Manager;
+with Xm_Widgets.Protocols;    use Xm_Widgets.Protocols;
+
+
+package body Xm_Utilities.Protocols is
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Add_WM_Delete_Window_Callback
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Add_WM_Delete_Window_Callback
+    (Shell    : in Widget;
+     Callback : in Xt_Callback_Proc;
+     Closure  : in Xt_Pointer := Null_Xt_Pointer) is
+   begin
+      Xm_Add_WM_Protocol_Callback
+       (Shell,
+        Xm_Intern_Atom (Xt_Display_Of_Object (Shell),
+                        "WM_DELETE_WINDOW", True),
+        Callback,
+        Closure);
+   end Add_WM_Delete_Window_Callback;
+
+end Xm_Utilities.Protocols;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.ads ./lib/xm_utilities-protocols.ads
--- ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.ads   Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-protocols.ads    Thu Dec 26 13:36:40 2002
@@ -0,0 +1,18 @@
+--  2002-10-05
+with X_Toolkit;
+
+
+package Xm_Utilities.Protocols is
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Add_WM_Delete_Window_Callback
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Add_WM_Delete_Window_Callback
+    (Shell    : in X_Toolkit.Widget;
+     Callback : in X_Toolkit.Xt_Callback_Proc;
+     Closure  : in X_Toolkit.Xt_Pointer := X_Toolkit.Null_Xt_Pointer);
+
+end Xm_Utilities.Protocols;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-strings.ads ./lib/xm_utilities-strings.ads
--- ../adabindx-0.7.2.orig/lib/xm_utilities-strings.ads Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-strings.ads  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,46 @@
+--  2002-10-19
+with Xm_Widgets;
+
+
+package Xm_Utilities.Xm_Strings is
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append (Source   : in out Xm_Widgets.Xm_String;
+                     New_Item : in     String);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append (Source   : in out Xm_Widgets.Xm_String;
+                     New_Item : in     Wide_String);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Separator
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Separator (Source : in out Xm_Widgets.Xm_String);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Tab
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure Append_Tab (Source : in out Xm_Widgets.Xm_String);
+
+
+end Xm_Utilities.Xm_Strings;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-xm_strings.adb ./lib/xm_utilities-xm_strings.adb
--- ../adabindx-0.7.2.orig/lib/xm_utilities-xm_strings.adb  Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities-xm_strings.adb   Thu Dec 26 13:36:40 2002
@@ -0,0 +1,80 @@
+--  2002-10-19
+with X_Toolkit;  use X_Toolkit;
+with Xm_Widgets; use Xm_Widgets;
+
+
+package body Xm_Utilities.Xm_Strings is
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append (Source   : in out Xm_String;
+                     New_Item : in     String) is
+      Tmp : Xm_String;
+   begin
+      Tmp := Xm_String_Generate (New_Item);
+      if Source = Null_Xm_String then
+         Source := Tmp;
+      else
+         Source := Xm_String_Concat_And_Free (Source, Tmp);
+      end if;
+   end Append;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append (Source   : in out Xm_String;
+                     New_Item : in     Wide_String) is
+      Tmp : Xm_String;
+   begin
+      Tmp := Xm_String_Generate (New_Item);
+      if Source = Null_Xm_String then
+         Source := Tmp;
+      else
+         Source := Xm_String_Concat_And_Free (Source, Tmp);
+      end if;
+   end Append;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Separator
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Separator (Source : in out Xm_String) is
+      Tmp : Xm_String;
+   begin
+      Tmp :=
+        Xm_String_Component_Create (Component_Separator, 0, Null_Xt_Pointer);
+      if Source = Null_Xm_String then
+         Source := Tmp;
+      else
+         Source := Xm_String_Concat_And_Free (Source, Tmp);
+      end if;
+   end Append_Separator;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Tab
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Tab (Source : in out Xm_String) is
+      Tmp : Xm_String;
+   begin
+      Tmp := Xm_String_Component_Create (Component_Tab, 0, Null_Xt_Pointer);
+      if Source = Null_Xm_String then
+         Source := Tmp;
+      else
+         Source := Xm_String_Concat_And_Free (Source, Tmp);
+      end if;
+   end Append_Tab;
+
+
+end Xm_Utilities.Xm_Strings;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities.ads ./lib/xm_utilities.ads
--- ../adabindx-0.7.2.orig/lib/xm_utilities.ads Thu Jan  1 01:00:00 1970
+++ ./lib/xm_utilities.ads  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,9 @@
+--  2002-10-07
+
+package Xm_Utilities is
+
+   pragma Pure (Xm_Utilities);
+
+   Use_Error : exception;
+
+end Xm_Utilities;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-display.adb ./lib/xm_widgets-display.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-display.adb   Sat Mar  2 12:17:14 2002
+++ ./lib/xm_widgets-display.adb    Thu Dec 26 13:36:40 2002
@@ -43,7 +43,7 @@
 with Ada.Unchecked_Conversion;
 package body Xm_Widgets.Display is
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Callback_Struct (Pointer : in Xt_Pointer)
       return Xm_Drag_Start_Callback_Struct_Access is
       function To_CS is
@@ -94,7 +94,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    function To_Integer is
       new Ada.Unchecked_Conversion (Drag_Protocol_Style_Type, Interfaces.C.unsigned_char);
@@ -121,7 +121,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Enable_Btn1_Transfer_Type, Interfaces.C.unsigned_char);
 
@@ -172,6 +172,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Display;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-display.ads ./lib/xm_widgets-display.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-display.ads   Sat Mar  2 12:17:14 2002
+++ ./lib/xm_widgets-display.ads    Thu Dec 26 13:36:40 2002
@@ -44,7 +44,7 @@
 package Xm_Widgets.Display is
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Xm_Drag_Start_Callback_Struct is record
       Reason : Callback_Reason;
       Event  : X_Lib.X_Event_Pointer;
@@ -80,7 +80,7 @@
    function To_Callback_Struct (Pointer : in Xt_Pointer)
       return Xm_Display_Callback_Struct_Access;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 
@@ -95,7 +95,7 @@
    --
    -- resources
    --
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Default_Button_Emphasis       : constant Xt_N_Resource_String;
 
    type Default_Button_Emphasis_Type is
@@ -110,7 +110,7 @@
                          Value :    out Default_Button_Emphasis_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Default_Virtual_Bindings      : constant Xt_N_Resource_String;
    Xm_N_Drag_Initiator_Protocol_Style : constant Xt_N_Resource_String;
@@ -131,7 +131,7 @@
                          Value :    out Drag_Protocol_Style_Type);
    pragma Convention (C, Append_Get);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Drag_Start_Callback           : constant Xt_N_Resource_String;
    Xm_N_Enable_Btn1_Transfer          : constant Xt_N_Resource_String;
 
@@ -170,16 +170,16 @@
    Xm_N_No_Font_Callback              : constant Xt_N_Resource_String;
    Xm_N_No_Rendition_Callback         : constant Xt_N_Resource_String;
    Xm_N_User_Data                     : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 private
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Default_Button_Emphasis_Type use
      (External_Highlight => 0, Internal_Highlight => 1);
    for Default_Button_Emphasis_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    for Drag_Protocol_Style_Type use
      (None => 0, Drop_Only => 1,
@@ -188,30 +188,30 @@
       Prefer_Receiver => 6);
    for Drag_Protocol_Style_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Enable_Btn1_Transfer_Type use
      (Off => 0, Button2_Adjust => 1, Button2_Transfer => 2);
    for Enable_Btn1_Transfer_Type'Size use Interfaces.C.unsigned_char'Size;
 
    for Enable_Warp_Type use (On => 0, Off => 1);
    for Enable_Warp_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 
    pragma Import (C, Xm_Get_Xm_Display, "XmGetXmDisplay");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Default_Button_Emphasis       : constant Xt_N_Resource_String :=
       To_Resource_String ("defaultButtonEmphasis");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Default_Virtual_Bindings      : constant Xt_N_Resource_String :=
       To_Resource_String ("defaultVirtualBindings");
    Xm_N_Drag_Initiator_Protocol_Style : constant Xt_N_Resource_String :=
       To_Resource_String ("dragInitiatorProtocolStyle");
    Xm_N_Drag_Receiver_Protocol_Style  : constant Xt_N_Resource_String :=
       To_Resource_String ("dragReceiverProtocolStyle");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Drag_Start_Callback           : constant Xt_N_Resource_String :=
       To_Resource_String ("dragStartCallback");
    Xm_N_Enable_Btn1_Transfer          : constant Xt_N_Resource_String :=
@@ -238,6 +238,6 @@
       To_Resource_String ("noRenditionCallback");
    Xm_N_User_Data                     : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_User_Data;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Display;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.adb ./lib/xm_widgets-manager-bulletin_board-column.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.adb Thu Jan  1 01:00:00 1970
+++ ./lib/xm_widgets-manager-bulletin_board-column.adb  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,143 @@
+-------------------------------------------------------------------------------
+--                                                                           --
+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
+--  This file also copyright (c) 2002 Vadim Godunko                          --
+--                                                                           --
+--  Adabindx is free software; you can redistribute it and/or modify it      --
+--  under the terms of the GNU General Public License as published by the    --
+--  Free Software Foundation; either version 2 of the License, or (at your   --
+--  option) any later version.                                               --
+--                                                                           --
+--  This program is distributed in the hope that it will be useful, but      --
+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
+--  See the GNU General Public License for more details.                     --
+--                                                                           --
+--  You should have received a copy of the GNU General Public License        --
+--  along with this program; if not, write to the                            --
+--  Free Software Foundation, Inc.,                                          --
+--  59 Temple Place - Suite 330,                                             --
+--  Boston, MA 02111-1307, USA.                                              --
+--                                                                           --
+--  As a special exception, if other files instantiate generics from this    --
+--  unit, or you link this unit with other files to produce an executable,   --
+--  this unit does not by itself cause the resulting executable to be        --
+--  covered by the GNU General Public License. This exception does not       --
+--  however invalidate any other reasons why the executable file might be    --
+--  covered by the GNU General Public License.                               --
+--                                                                           --
+--  X Window System is copyrighted by the X Consortium                       --
+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
+--                  and by The Open Group                                    --
+--                                                                           --
+--                                                                           --
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+--
+-- HISTORY:
+--          2002-10-20  Vadim Godunko: first definition of this file
+--
+-------------------------------------------------------------------------------
+with Ada.Unchecked_Conversion;
+
+with X_Toolkit.Internal;
+
+
+package body Xm_Widgets.Manager.Bulletin_Board.Column is
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Get
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Distribution) is
+   begin
+      Append_Set (List, Name, Value'Address);
+   end Append_Get;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Get
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Fill_Style) is
+   begin
+      Append_Set (List, Name, Value'Address);
+   end Append_Get;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value : in     Distribution) is
+      function To_Integer is
+        new Ada.Unchecked_Conversion (Distribution,
+                                      Interfaces.C.unsigned_char);
+   begin
+      Append_Set (List, Name, To_Integer (Value));
+   end Append_Set;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Append_Set
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Append_Set (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value : in     Fill_Style) is
+      function To_Integer is
+        new Ada.Unchecked_Conversion (Fill_Style,
+                                      Interfaces.C.unsigned_char);
+   begin
+      Append_Set (List, Name, To_Integer (Value));
+   end Append_Set;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Create_Column
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Create_Column (Parent  : in Widget;
+                              Name    : in String;
+                              Arglist : in Arg_List := Null_Arg_List)
+     return Widget
+   is
+      function XmCreateColumn (Parent : in Widget;
+                               Name   : in Interfaces.C.char_array;
+                               Args   : in X_Toolkit.Internal.Arg_Rec_Access;
+                               Count  : in Cardinal)
+        return Widget;
+      pragma Import (C, XmCreateColumn, "XmCreateColumn");
+   begin
+      return XmCreateColumn (Parent, Interfaces.C.To_C (Name),
+                             X_Toolkit.Internal.Hook (Arglist),
+                             Cardinal (Length (Arglist)));
+   end Xm_Create_Column;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Is_Column
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Is_Column (W : in Widget) return Boolean is
+   begin
+      return Xt_Is_Subclass (W, Xm_Column_Widget_Class);
+   end Xm_Is_Column;
+
+
+end Xm_Widgets.Manager.Bulletin_Board.Column;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.ads ./lib/xm_widgets-manager-bulletin_board-column.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.ads Thu Jan  1 01:00:00 1970
+++ ./lib/xm_widgets-manager-bulletin_board-column.ads  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,170 @@
+-------------------------------------------------------------------------------
+--                                                                           --
+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
+--  This file also copyright (c) 2002 Vadim Godunko                          --
+--                                                                           --
+--  Adabindx is free software; you can redistribute it and/or modify it      --
+--  under the terms of the GNU General Public License as published by the    --
+--  Free Software Foundation; either version 2 of the License, or (at your   --
+--  option) any later version.                                               --
+--                                                                           --
+--  This program is distributed in the hope that it will be useful, but      --
+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
+--  See the GNU General Public License for more details.                     --
+--                                                                           --
+--  You should have received a copy of the GNU General Public License        --
+--  along with this program; if not, write to the                            --
+--  Free Software Foundation, Inc.,                                          --
+--  59 Temple Place - Suite 330,                                             --
+--  Boston, MA 02111-1307, USA.                                              --
+--                                                                           --
+--  As a special exception, if other files instantiate generics from this    --
+--  unit, or you link this unit with other files to produce an executable,   --
+--  this unit does not by itself cause the resulting executable to be        --
+--  covered by the GNU General Public License. This exception does not       --
+--  however invalidate any other reasons why the executable file might be    --
+--  covered by the GNU General Public License.                               --
+--                                                                           --
+--  X Window System is copyrighted by the X Consortium                       --
+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
+--                  and by The Open Group                                    --
+--                                                                           --
+--                                                                           --
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+--
+-- HISTORY:
+--          2002-10-20 Vadim Godunko: first definition of this file
+--
+-------------------------------------------------------------------------------
+
+package Xm_Widgets.Manager.Bulletin_Board.Column is
+
+--  UseOpenMotif2.2
+
+   Xm_Column_Widget_Class : constant Widget_Class;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Is_Column
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   function Xm_Is_Column (W : in Widget) return Boolean;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Create_Column
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   function Xm_Create_Column (Parent  : in Widget;
+                              Name    : in String;
+                              Arglist : in Arg_List := Null_Arg_List)
+     return Widget;
+
+--   currently not implemented
+--   function Xm_Column_Get_Child_Label () return Widget;
+
+
+   Xm_N_Default_Entry_Label_Alignment : constant Xt_N_Resource_String;
+   Xm_N_Default_Entry_Label_Font_List : constant Xt_N_Resource_String;
+   Xm_N_Default_Fill_Style            : constant Xt_N_Resource_String;
+   Xm_N_Distribution                  : constant Xt_N_Resource_String;
+
+   type Distribution is (Spread, Tight);
+
+   procedure Append_Set (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value : in     Distribution);
+
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Distribution);
+   pragma Convention (C, Append_Get);
+
+   Xm_N_Item_Spacing                  : constant Xt_N_Resource_String;
+   Xm_N_Label_Spacing                 : constant Xt_N_Resource_String;
+   Xm_N_Orientation                   : constant Xt_N_Resource_String;
+
+   --  constraint resources
+
+   Xm_N_Entry_Label_Alignment         : constant Xt_N_Resource_String;
+   Xm_N_Entry_Label_Font_List         : constant Xt_N_Resource_String;
+   Xm_N_Entry_Label_Pixmap            : constant Xt_N_Resource_String;
+   Xm_N_Entry_Label_String            : constant Xt_N_Resource_String;
+   Xm_N_Entry_Label_Type              : constant Xt_N_Resource_String;
+   Xm_N_Fill_Style                    : constant Xt_N_Resource_String;
+
+   type Fill_Style is (Unspecified, Flush, Ragged);
+
+   procedure Append_Set (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value : in     Fill_Style);
+
+   procedure Append_Get (List  : in out Arg_List;
+                         Name  : in     Xt_N_Resource_String;
+                         Value :    out Fill_Style);
+   pragma Convention (C, Append_Get);
+
+   Xm_N_Show_Entry_Label              : constant Xt_N_Resource_String;
+   Xm_N_Stretchable                   : constant Xt_N_Resource_String;
+
+
+private
+
+   for Distribution use (Spread => 0, Tight => 1);
+   for Distribution'Size use Interfaces.C.unsigned_char'Size;
+
+   for Fill_Style use (Unspecified => 0, Flush => 1, Ragged => 2);
+   for Fill_Style'Size use Interfaces.C.unsigned_char'Size;
+
+   c_const_Xm_Column_Widget_Class : Widget_Class;
+   pragma Import (C, c_const_Xm_Column_Widget_Class, "xmColumnWidgetClass");
+
+   Xm_Column_Widget_Class : constant Widget_Class :=
+     c_const_Xm_Column_Widget_Class;
+
+
+   Xm_N_Default_Entry_Label_Alignment : constant Xt_N_Resource_String :=
+     To_Resource_String("defaultEntryLabelAlignment");
+   Xm_N_Default_Entry_Label_Font_List : constant Xt_N_Resource_String :=
+     To_Resource_String("defaultEntryLabelFontList");
+   Xm_N_Default_Fill_Style            : constant Xt_N_Resource_String :=
+     To_Resource_String("defaultFillStyle");
+   Xm_N_Distribution                  : constant Xt_N_Resource_String :=
+     To_Resource_String("distribution");
+   Xm_N_Item_Spacing                  : constant Xt_N_Resource_String :=
+     To_Resource_String("itemSpacing");
+   Xm_N_Label_Spacing                 : constant Xt_N_Resource_String :=
+     To_Resource_String("labelSpacing");
+   Xm_N_Orientation                   : constant Xt_N_Resource_String :=
+     X_Toolkit.Xt_N_Orientation;
+
+   --  constraint resources
+
+   Xm_N_Entry_Label_Alignment         : constant Xt_N_Resource_String :=
+     To_Resource_String("entryLabelAlignment");
+   Xm_N_Entry_Label_Font_List         : constant Xt_N_Resource_String :=
+     To_Resource_String("entryLabelFontList");
+   Xm_N_Entry_Label_Pixmap            : constant Xt_N_Resource_String :=
+     To_Resource_String("entryLabelPixmap");
+   Xm_N_Entry_Label_String            : constant Xt_N_Resource_String :=
+     To_Resource_String("entryLabelString");
+   Xm_N_Entry_Label_Type              : constant Xt_N_Resource_String :=
+     To_Resource_String("entryLabelType");
+   Xm_N_Fill_Style                    : constant Xt_N_Resource_String :=
+     To_Resource_String("fillStyle");
+   Xm_N_Show_Entry_Label              : constant Xt_N_Resource_String :=
+     To_Resource_String("showEntryLabel");
+   Xm_N_Stretchable                   : constant Xt_N_Resource_String :=
+     To_Resource_String("stretchable");
+
+--  EndOpenMotif2.2
+
+end Xm_Widgets.Manager.Bulletin_Board.Column;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb    Thu Dec 26 13:36:40 2002
@@ -138,7 +138,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Filter_Style_Type, Interfaces.C.unsigned_char);
 
@@ -164,7 +164,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
@@ -193,7 +193,7 @@
 
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Path_Mode_Type, Interfaces.C.unsigned_char);
 
@@ -219,7 +219,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    function To_Integer is
       new Ada.Unchecked_Conversion (Xm_Qualify_Proc, Integer);
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads    Thu Dec 26 13:36:40 2002
@@ -170,7 +170,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Dir_Spec               : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Dir_Text_Label_String  : constant Xt_N_Resource_String;
    Xm_N_Filter_Label_String    : constant Xt_N_Resource_String;
    Xm_N_Filter_Style           : constant Xt_N_Resource_String;
@@ -187,7 +187,7 @@
    pragma Convention (C, Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_File_List_Items        : constant Xt_N_Resource_String;
    Xm_N_File_List_Item_Count   : constant Xt_N_Resource_String;
    Xm_N_File_List_Label_String : constant Xt_N_Resource_String;
@@ -207,7 +207,7 @@
 
    Xm_N_List_Updated           : constant Xt_N_Resource_String;
    Xm_N_No_Match_String        : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Path_Mode              : constant Xt_N_Resource_String;
 
    type Path_Mode_Type is (Mode_Full, Mode_Relative);
@@ -221,7 +221,7 @@
                          Value :    out Path_Mode_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Pattern                : constant Xt_N_Resource_String;
    Xm_N_Qualify_Search_Data_Proc : constant Xt_N_Resource_String;
@@ -284,16 +284,16 @@
       Xm_Widgets.Manager.Bulletin_Board.Selection_Box.Text_Field_Name;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Filter_Style_Type use (Filter_None => 0, Filter_Hidden_Files => 1);
    for Filter_Style_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    for File_Type_Mask use (Directory => 0, Regular => 1, Any_Type => 2);
    for File_Type_Mask'Size use Interfaces.C.unsigned_char'Size;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Path_Mode_Type use (Mode_Full => 0, Mode_Relative => 1);
    for Path_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    pragma Import (C, Xm_File_Selection_Box_Get_Child, "XmFileSelectionBoxGetChild");
    pragma Import (C, Xm_File_Selection_Do_Search, "XmFileSelectionDoSearch");
@@ -327,14 +327,14 @@
       := To_Resource_String ("dirSearchProc");
    Xm_N_Dir_Spec               : constant Xt_N_Resource_String
       := To_Resource_String ("dirSpec");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Dir_Text_Label_String  : constant Xt_N_Resource_String
       := To_Resource_String ("dirTextLabelString");
    Xm_N_Filter_Label_String    : constant Xt_N_Resource_String
       := To_Resource_String ("filterLabelString");
    Xm_N_Filter_Style           : constant Xt_N_Resource_String
       := To_Resource_String ("filterStyle");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_File_List_Items        : constant Xt_N_Resource_String
       := To_Resource_String ("fileListItems");
    Xm_N_File_List_Item_Count   : constant Xt_N_Resource_String
@@ -349,10 +349,10 @@
       := To_Resource_String ("listUpdated");
    Xm_N_No_Match_String        : constant Xt_N_Resource_String
       := To_Resource_String ("noMatchString");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Path_Mode              : constant Xt_N_Resource_String
       := To_Resource_String ("pathMode");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Pattern                : constant Xt_N_Resource_String
       := To_Resource_String ("pattern");
    Xm_N_Qualify_Search_Data_Proc : constant Xt_N_Resource_String
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board.ads ./lib/xm_widgets-manager-bulletin_board.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board.ads    Sat Mar  2 12:17:14 2002
+++ ./lib/xm_widgets-manager-bulletin_board.ads Thu Dec 26 13:36:40 2002
@@ -69,9 +69,9 @@
    Xm_N_Allow_Overlap          : constant Xt_N_Resource_String;
    Xm_N_Auto_Unmanage          : constant Xt_N_Resource_String;
    Xm_N_Button_Font_List       : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Cancel_Button          : constant Xt_N_Resource_String;
    Xm_N_Default_Button         : constant Xt_N_Resource_String;
@@ -95,9 +95,9 @@
    Xm_N_Dialog_Title           : constant Xt_N_Resource_String;
    Xm_N_Focus_Callback         : constant Xt_N_Resource_String;
    Xm_N_Label_Font_List        : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Map_Callback           : constant Xt_N_Resource_String;
    Xm_N_Margin_Height          : constant Xt_N_Resource_String;
    Xm_N_Margin_Width           : constant Xt_N_Resource_String;
@@ -120,9 +120,9 @@
 
 
    Xm_N_Text_Font_List         : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Text_Translations      : constant Xt_N_Resource_String;
 
    --
@@ -160,10 +160,10 @@
       := To_Resource_String ("autoUnmanage");
    Xm_N_Button_Font_List       : constant Xt_N_Resource_String
       := To_Resource_String ("buttonFontList");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String
       := To_Resource_String ("buttonRenderTable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Cancel_Button          : constant Xt_N_Resource_String
       := To_Resource_String ("cancelButton");
@@ -181,10 +181,10 @@
       := To_Resource_String ("focusCallback");
    Xm_N_Label_Font_List        : constant Xt_N_Resource_String
       := To_Resource_String ("labelFontList");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String
       := To_Resource_String ("labelRenderTable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Map_Callback           : constant Xt_N_Resource_String
       := To_Resource_String ("mapCallback");
    Xm_N_Margin_Height          : constant Xt_N_Resource_String
@@ -200,10 +200,10 @@
 
    Xm_N_Text_Font_List         : constant Xt_N_Resource_String
       := To_Resource_String ("textFontList");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String
       := To_Resource_String ("textRenderTable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Text_Translations      : constant Xt_N_Resource_String
       := To_Resource_String ("textTranslations");
 
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.adb ./lib/xm_widgets-manager-combo_box.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.adb Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-combo_box.adb  Thu Dec 26 13:36:40 2002
@@ -46,7 +46,7 @@
      X_Toolkit.Internal;
 package body Xm_Widgets.Manager.Combo_Box is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    function Xm_Is_Combo_Box (W : in Widget) return Boolean is
    begin
@@ -141,7 +141,7 @@
                                    Cardinal (Length (Arglist)));
    end Xm_Create_Drop_Down_List;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    procedure Xm_Combo_Box_Add_Item
      (W      : in Widget;
       Item   : in Xm_String;
@@ -157,7 +157,7 @@
       XmComboBoxAddItem (W, Item, Pos, To_Xt_Boolean (Unique));
    end Xm_Combo_Box_Add_Item;
    pragma Inline (Xm_Combo_Box_Add_Item);
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 
    function To_Integer is
@@ -210,7 +210,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Position_Mode_Type, Interfaces.C.unsigned_char);
 
@@ -233,8 +233,8 @@
                   Value => Value'Address);
    end Append_Get;
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Combo_Box;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.ads ./lib/xm_widgets-manager-combo_box.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-combo_box.ads  Thu Dec 26 13:36:40 2002
@@ -46,7 +46,7 @@
 
 package Xm_Widgets.Manager.Combo_Box is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    -- -------------------------------------------------------------------------
    --
@@ -99,7 +99,7 @@
    procedure Xm_Combo_Box_Update (W : in Widget);
 
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    procedure Xm_Combo_Box_Add_Item
      (W      : in Widget;
       Item   : in Xm_String;
@@ -117,7 +117,7 @@
    procedure Xm_Combo_Box_Set_Item
      (W    : in Widget;
       Item : in Xm_String);
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    -- -------------------------------------------------------------------------
    --
@@ -126,9 +126,9 @@
 
    Xm_N_Arrow_Size              : constant Xt_N_Resource_String;
    Xm_N_Arrow_Spacing           : constant Xt_N_Resource_String;
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Columns                 : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Combo_Box_Type          : constant Xt_N_Resource_String;
 
    type Combo_Box_Type is (Combo_Box, Drop_Down_Combo_Box, Drop_Down_List);
@@ -144,11 +144,11 @@
 
    Xm_N_Font_List               : constant Xt_N_Resource_String;
    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Item_Count              : constant Xt_N_Resource_String;
    Xm_N_Items                   : constant Xt_N_Resource_String;
    Xm_N_List                    : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
    Xm_N_Margin_Width            : constant Xt_N_Resource_String;
    Xm_N_Match_Behavior          : constant Xt_N_Resource_String;
@@ -164,7 +164,7 @@
                          Value :    out Match_Behavior_Type);
    pragma Convention (C, Append_Get);
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Position_Mode           : constant Xt_N_Resource_String;
    
    type Position_Mode_Type is (Zero_Based, One_Based);
@@ -178,17 +178,17 @@
                          Value :    out Position_Mode_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
    Xm_N_Selected_Item           : constant Xt_N_Resource_String;
    Xm_N_Selected_Position       : constant Xt_N_Resource_String;
    Xm_N_Selection_Callback      : constant Xt_N_Resource_String;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Text_Field              : constant Xt_N_Resource_String;
    Xm_N_Visible_Item_Count      : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 private
 
@@ -198,17 +198,17 @@
    for Match_Behavior_Type use (None => 0, Quick_Navigate => 1, Invalid_Match_Behavior => 2);
    for Match_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    for Position_Mode_Type use (Zero_Based => 0, One_Based => 1);
    for Position_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    pragma Import (C, Xm_Combo_Box_Update, "XmComboBoxUpdate");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    pragma Import (C, Xm_Combo_Box_Delete_Pos, "XmComboBoxDeletePos");
    pragma Import (C, Xm_Combo_Box_Select_Item, "XmComboBoxSelectItem");
    pragma Import (C, Xm_Combo_Box_Set_Item, "XmComboBoxSetItem");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    c_const_Xm_Combo_Box_Widget_Class           : Widget_Class;
 
@@ -227,10 +227,10 @@
       := To_Resource_String ("arrowSize");
    Xm_N_Arrow_Spacing           : constant Xt_N_Resource_String
       := To_Resource_String ("arrowSpacing");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Columns                 : constant Xt_N_Resource_String
       := To_Resource_String ("columns");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Combo_Box_Type          : constant Xt_N_Resource_String
       := To_Resource_String ("comboBoxType");
 
@@ -238,24 +238,24 @@
       := Xm_Widgets.Xm_N_Font_List;
    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String
       := To_Resource_String ("highlightThickness");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Item_Count              : constant Xt_N_Resource_String
       := To_Resource_String ("itemCount");
    Xm_N_Items                   : constant Xt_N_Resource_String
       := To_Resource_String ("items");
    Xm_N_List                    : constant Xt_N_Resource_String
       := To_Resource_String ("list");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Margin_Height           : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Margin_Height;
    Xm_N_Margin_Width            : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Margin_Width;
    Xm_N_Match_Behavior          : constant Xt_N_Resource_String
       := To_Resource_String ("matchBehavior");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Position_Mode           : constant Xt_N_Resource_String
       := To_Resource_String ("positionMode");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_Render_Table            : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Render_Table;
@@ -266,13 +266,13 @@
    Xm_N_Selection_Callback      : constant Xt_N_Resource_String
       := To_Resource_String ("selectionCallback");
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Text_Field              : constant Xt_N_Resource_String
       := To_Resource_String ("textField");
    Xm_N_Visible_Item_Count      : constant Xt_N_Resource_String
       := To_Resource_String ("visibleItemCount");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Combo_Box;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.adb ./lib/xm_widgets-manager-container.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.adb Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-container.adb  Thu Dec 26 13:36:40 2002
@@ -45,7 +45,7 @@
      X_Toolkit.Internal;
 package body Xm_Widgets.Manager.Container is
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    function Xm_Is_Container (W : in Widget) return Boolean is
    begin
@@ -571,6 +571,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Container;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.ads ./lib/xm_widgets-manager-container.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-container.ads  Thu Dec 26 13:36:40 2002
@@ -42,7 +42,7 @@
 
 package Xm_Widgets.Manager.Container is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    -- -------------------------------------------------------------------------
    --
@@ -524,6 +524,6 @@
    Xm_N_Position_Index          : constant Xt_N_Resource_String
       := To_Resource_String ("positionIndex");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Container;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-drawing_area.ads ./lib/xm_widgets-manager-drawing_area.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-drawing_area.ads  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-drawing_area.ads   Thu Dec 26 13:36:40 2002
@@ -83,10 +83,10 @@
    -- resource values
    --
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
    Xm_N_Destination_Callback    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Expose_Callback         : constant Xt_N_Resource_String;
    Xm_N_Input_Callback          : constant Xt_N_Resource_String;
    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
@@ -110,12 +110,12 @@
    -- resource values
    --
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
       To_Resource_String ("convertCallback");
    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Destination_Callback;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Expose_Callback         : constant Xt_N_Resource_String :=
       To_Resource_String ("exposeCallback");
    Xm_N_Input_Callback          : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.adb ./lib/xm_widgets-manager-frame.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.adb Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-frame.adb  Thu Dec 26 13:36:40 2002
@@ -99,7 +99,7 @@
    end Append_Get;
    pragma Inline (Append_Get);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Vertical_Alignment, Interfaces.C.unsigned_char);
 
@@ -123,7 +123,7 @@
                   Value  => Value'Address);
    end Append_Get;
    pragma Inline (Append_Get);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.ads ./lib/xm_widgets-manager-frame.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-frame.ads  Thu Dec 26 13:36:40 2002
@@ -90,7 +90,7 @@
    Xm_N_Child_Horizontal_Spacing : constant Xt_N_Resource_String;
    Xm_N_Child_Vertical_Alignment : constant Xt_N_Resource_String;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Vertical_Alignment is (Alignment_Baseline_Top,
                                Alignment_Center,
                                Alignment_Baseline_Bottom,
@@ -110,7 +110,7 @@
 
    -- replacement for Xm_N_Child_Type
    Xm_N_Frame_Child_Type         : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    type Frame_Child_Type is
      (Generic_Child, Workarea_Child, Title_Child);
@@ -134,7 +134,7 @@
      (Generic_Child => 0, Workarea_Child => 1, Title_Child => 2);
    for Frame_Child_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Vertical_Alignment use (Alignment_Baseline_Top => 0,
                                Alignment_Center => 1,
                                Alignment_Baseline_Bottom => 2,
@@ -145,7 +145,7 @@
       Alignment_Widget_Bottom;
    Alignment_Child_Bottom : constant Vertical_Alignment :=
       Alignment_Widget_Top;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    c_const_Xm_Frame_Widget_Class               : Widget_Class;
@@ -179,10 +179,10 @@
       To_Resource_String ("childHorizontalSpacing");
    Xm_N_Child_Vertical_Alignment : constant Xt_N_Resource_String :=
       To_Resource_String ("childVerticalAlignment");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    -- replacement for Xm_N_Child_Type
    Xm_N_Frame_Child_Type         : constant Xt_N_Resource_String :=
       To_Resource_String ("frameChildType");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Frame;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.adb ./lib/xm_widgets-manager-notebook.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.adb  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-notebook.adb   Thu Dec 26 13:36:40 2002
@@ -45,7 +45,7 @@
      X_Toolkit.Internal;
 package body Xm_Widgets.Manager.Notebook is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    function To_Callback_Struct (Pointer : in Xt_Pointer)
       return Xm_Notebook_Callback_Struct_Access is
@@ -170,6 +170,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Notebook;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.ads ./lib/xm_widgets-manager-notebook.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.ads  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-notebook.ads   Thu Dec 26 13:36:40 2002
@@ -42,7 +42,7 @@
 
 package Xm_Widgets.Manager.Notebook is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    -- -------------------------------------------------------------------------
    --
@@ -247,6 +247,6 @@
    Xm_N_Notebook_Child_Type     : constant Xt_N_Resource_String
       := To_Resource_String ("notebookChildType");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Notebook;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-paned_window.ads ./lib/xm_widgets-manager-paned_window.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-paned_window.ads  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-paned_window.ads   Thu Dec 26 13:36:40 2002
@@ -62,12 +62,12 @@
 
    Xm_N_Margin_Height          : constant Xt_N_Resource_String;
    Xm_N_Margin_Width           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    --  use Xm_Widgets.Orientation_Type for this
    --
    Xm_N_Orientation            : constant Xt_N_Resource_String;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Refigure_Mode          : constant Xt_N_Resource_String;
    Xm_N_Sash_Height            : constant Xt_N_Resource_String;
    Xm_N_Sash_Indent            : constant Xt_N_Resource_String;
@@ -106,9 +106,9 @@
       := Xm_Widgets.Xm_N_Margin_Height;
    Xm_N_Margin_Width           : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Margin_Width;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Orientation            : constant Xt_N_Resource_String := X_Toolkit.Xt_N_Orientation;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Refigure_Mode          : constant Xt_N_Resource_String := To_Resource_String ("refigureMode");
    Xm_N_Sash_Height            : constant Xt_N_Resource_String := To_Resource_String ("sashHeight");
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.adb ./lib/xm_widgets-manager-row_column.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.adb    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-row_column.adb Thu Dec 26 13:36:40 2002
@@ -319,7 +319,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Tear_Off_Model_Type, Interfaces.C.unsigned_char);
 
@@ -345,7 +345,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 end Xm_Widgets.Manager.Row_Column;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.ads ./lib/xm_widgets-manager-row_column.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.ads    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-row_column.ads Thu Dec 26 13:36:40 2002
@@ -205,11 +205,11 @@
    --  for Ease of usage, we define here nevertheless a different type,
    --  consistent with Motif 2.0+
    --
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Popup_Type is (Disabled, Keyboard, Automatic, Automatic_Recursive);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    type Popup_Type is (Disabled, Keyboard);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    procedure Append_Set (List  : in out Arg_List;
             Name  : in Xt_N_Resource_String;
@@ -236,7 +236,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Sub_Menu_ID            : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Tear_Off_Menu_Activate_Callback : constant Xt_N_Resource_String;
    Xm_N_Tear_Off_Menu_Deactivate_Callback : constant Xt_N_Resource_String;
    Xm_N_Tear_Off_Model         : constant Xt_N_Resource_String;
@@ -254,7 +254,7 @@
 
 
    Xm_N_Tear_Off_Title         : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Unmap_Callback         : constant Xt_N_Resource_String;
    Xm_N_Which_Button           : constant Xt_N_Resource_String;
 
@@ -271,21 +271,21 @@
    for Packing_Type use (No_Packing => 0, Pack_Tight => 1, Pack_Column => 2, Pack_None => 3);
    for Packing_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Popup_Type use (Disabled => 0, Keyboard => 1, Automatic => 2, Automatic_Recursive => 3);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    for Popup_Type use (Disabled => 0, Keyboard => 1);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    for Popup_Type'Size use Interfaces.C.unsigned'Size;
 
    for Row_Column_Type use (Work_Area => 0, Menu_Bar => 1, Menu_Pulldown => 2,
                             Menu_Popup => 3, Menu_Option => 4);
    for Row_Column_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Tear_Off_Model_Type use (Tear_Off_Enabled => 0, Tear_Off_Disabled => 1);
    for Tear_Off_Model_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    pragma Import (C, Xm_Menu_Position, "XmMenuPosition");
    pragma Import (C, Xm_Option_Label_Gadget, "XmOptionLabelGadget");
@@ -376,7 +376,7 @@
 
    Xm_N_Sub_Menu_ID            : constant Xt_N_Resource_String
       := To_Resource_String ("subMenuId");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Tear_Off_Menu_Activate_Callback : constant Xt_N_Resource_String
       := To_Resource_String ("tearOffMenuActivateCallback");
    Xm_N_Tear_Off_Menu_Deactivate_Callback : constant Xt_N_Resource_String
@@ -386,7 +386,7 @@
 
    Xm_N_Tear_Off_Title         : constant Xt_N_Resource_String
       := To_Resource_String ("tearOffTitle");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Unmap_Callback         : constant Xt_N_Resource_String
       := To_Resource_String ("unmapCallback");
    Xm_N_Which_Button           : constant Xt_N_Resource_String
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scale.ads ./lib/xm_widgets-manager-scale.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scale.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-scale.ads  Thu Dec 26 13:36:40 2002
@@ -102,14 +102,14 @@
    --
    package SB renames Xm_Widgets.Primitive.Scroll_Bar;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Decimal_Points          : constant Xt_N_Resource_String;
    Xm_N_Drag_Callback           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Editable                : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Font_List               : constant Xt_N_Resource_String;
    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String;
    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
@@ -134,13 +134,13 @@
       renames SB.Append_Get;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Scale_Height            : constant Xt_N_Resource_String;
    Xm_N_Scale_Multiple          : constant Xt_N_Resource_String;
    Xm_N_Scale_Width             : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Show_Arrows             : constant Xt_N_Resource_String;
 
    subtype Show_Arrows_Type is SB.Show_Arrows_Type;
@@ -154,7 +154,7 @@
                          Value :    out SB.Show_Arrows_Type)
       renames SB.Append_Get;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Show_Value              : constant Xt_N_Resource_String;
 
@@ -170,7 +170,7 @@
                          Value :    out Show_Value_Type);
    pragma Convention (C, Append_Get);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Mark             : constant Xt_N_Resource_String;
 
    subtype Slider_Mark_Type is SB.Slider_Mark_Type;
@@ -215,7 +215,7 @@
                          Value :    out SB.Sliding_Mode_Type)
    renames SB.Append_Get;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Title_String            : constant Xt_N_Resource_String;
    Xm_N_Value                   : constant Xt_N_Resource_String;
@@ -244,18 +244,18 @@
    -- resource values
    --
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
       To_Resource_String ("convertCallback");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Decimal_Points          : constant Xt_N_Resource_String :=
       To_Resource_String ("decimalPoints");
    Xm_N_Drag_Callback           : constant Xt_N_Resource_String :=
       To_Resource_String ("dragCallback");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Editable                : constant Xt_N_Resource_String :=
       To_Resource_String ("editable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Font_List               : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Font_List;
    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String :=
@@ -272,32 +272,32 @@
    Xm_N_Processing_Direction    : constant Xt_N_Resource_String :=
       To_Resource_String ("processingDirection");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Render_Table;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Scale_Height            : constant Xt_N_Resource_String :=
       To_Resource_String ("scaleHeight");
    Xm_N_Scale_Multiple          : constant Xt_N_Resource_String :=
       To_Resource_String ("scaleMultiple");
    Xm_N_Scale_Width             : constant Xt_N_Resource_String :=
       To_Resource_String ("scaleWidth");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Show_Arrows             : constant Xt_N_Resource_String :=
       To_Resource_String ("showArrows");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Show_Value              : constant Xt_N_Resource_String :=
       To_Resource_String ("showValue");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Mark             : constant Xt_N_Resource_String :=
       To_Resource_String ("sliderMark");
    Xm_N_Slider_Visual           : constant Xt_N_Resource_String :=
       To_Resource_String ("sliderVisual");
    Xm_N_Sliding_Mode            : constant Xt_N_Resource_String :=
       To_Resource_String ("slidingMode");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Title_String            : constant Xt_N_Resource_String :=
       To_Resource_String ("titleString");
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window-main_window.ads ./lib/xm_widgets-manager-scrolled_window-main_window.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window-main_window.ads   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-scrolled_window-main_window.ads    Thu Dec 26 13:36:40 2002
@@ -109,7 +109,7 @@
    Xm_N_Message_Window          : constant Xt_N_Resource_String;
    Xm_N_Show_Separator          : constant Xt_N_Resource_String;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    -- extension of the contraint resource "child type" for children of
    -- scrolled window widget class
 
@@ -118,7 +118,7 @@
    Separator      : constant Scrolled_Window_Child_Type;
    Message_Window : constant Scrolled_Window_Child_Type;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 private
 
@@ -161,11 +161,11 @@
    Xm_N_Show_Separator          : constant Xt_N_Resource_String :=
       To_Resource_String ("showSeparator");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Menu_Bar       : constant Scrolled_Window_Child_Type := 1;
    Command_Window : constant Scrolled_Window_Child_Type := 4;
    Separator      : constant Scrolled_Window_Child_Type := 5;
    Message_Window : constant Scrolled_Window_Child_Type := 6;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Scrolled_Window.Main_Window;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.adb ./lib/xm_widgets-manager-scrolled_window.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.adb   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-scrolled_window.adb    Thu Dec 26 13:36:40 2002
@@ -89,7 +89,7 @@
 
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Auto_Drag_Model_Type, Interfaces.C.unsigned_char);
 
@@ -113,7 +113,7 @@
                   Value => Value'Address);
    end Append_Get;
    pragma Inline (Append_Get);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
@@ -216,7 +216,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
                          Value : in     Scrolled_Window_Child_Type) is
@@ -239,6 +239,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Scrolled_Window;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.ads ./lib/xm_widgets-manager-scrolled_window.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.ads   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-scrolled_window.ads    Thu Dec 26 13:36:40 2002
@@ -97,7 +97,7 @@
    -- resource values
    --
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Auto_Drag_Model            : constant Xt_N_Resource_String;
 
    -- for Xm_N_Auto_Drag_Model
@@ -114,7 +114,7 @@
                          Value :    out Auto_Drag_Model_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Clip_Window                : constant Xt_N_Resource_String;
    Xm_N_Horizontal_Scroll_Bar      : constant Xt_N_Resource_String;
@@ -184,7 +184,7 @@
    Xm_N_Work_Window                : constant Xt_N_Resource_String;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    -- constraint resource for the children
    Xm_N_Scrolled_Window_Child_Type  : constant Xt_N_Resource_String;
 
@@ -207,14 +207,14 @@
                          Value :    out Scrolled_Window_Child_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 private
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Auto_Drag_Model_Type use (Enabled => 0, Disabled => 1);
    for Auto_Drag_Model_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    for Scroll_Bar_Display_Policy_Type use (Static => 0, As_Needed => 1);
    for Scroll_Bar_Display_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
@@ -237,7 +237,7 @@
      (Variable_Visual => 0, Constant_Visual => 1, Resize_If_Possible => 2);
    for Visual_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Scrolled_Window_Child_Type is new Natural range 0 .. 11;
    Work_Area      : constant Scrolled_Window_Child_Type :=  0;
    Hor_Scrollbar  : constant Scrolled_Window_Child_Type :=  2;
@@ -247,7 +247,7 @@
    No_Scroll      : constant Scrolled_Window_Child_Type :=  9;
    Clip_Window    : constant Scrolled_Window_Child_Type := 10;
    Generic_Child  : constant Scrolled_Window_Child_Type := 11;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    pragma Import (C, Xm_Scroll_Visible, "XmScrollVisible");
    pragma Import (C, Xm_Scrolled_Window_Set_Areas, "XmScrolledWindowSetAreas");
@@ -266,9 +266,9 @@
    -- resource values
    --
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Auto_Drag_Model            : constant Xt_N_Resource_String := To_Resource_String ("autoDragModel");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Clip_Window                : constant Xt_N_Resource_String := To_Resource_String ("clipWindow");
    Xm_N_Horizontal_Scroll_Bar      : constant Xt_N_Resource_String := To_Resource_String ("horizontalScrollBar");
@@ -287,9 +287,9 @@
 
    Xm_N_Work_Window                : constant Xt_N_Resource_String := To_Resource_String ("workWindow");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    -- constraint resource for the children
    Xm_N_Scrolled_Window_Child_Type  : constant Xt_N_Resource_String := To_Resource_String ("scrolledWindowChildType");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Scrolled_Window;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.adb ./lib/xm_widgets-manager-spin_box-simple.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.adb   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-spin_box-simple.adb    Thu Dec 26 13:36:40 2002
@@ -48,7 +48,7 @@
 
 package body Xm_Widgets.Manager.Spin_Box.Simple is
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
 
    function To_Callback_Struct (Pointer : in Xt_Pointer)
       return Xm_Simple_Spin_Box_Callback_Struct_Access is
@@ -93,6 +93,6 @@
                                     Cardinal (Length (Arglist)));
    end Xm_Create_Simple_Spin_Box;
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Spin_Box.Simple;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.ads ./lib/xm_widgets-manager-spin_box-simple.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.ads   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-spin_box-simple.ads    Thu Dec 26 13:36:40 2002
@@ -48,7 +48,7 @@
 
 package Xm_Widgets.Manager.Spin_Box.Simple is
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
 
    Xm_Simple_Spin_Box_Widget_Class     : constant Widget_Class;
 
@@ -137,6 +137,6 @@
    pragma Import (C, Xm_Simple_Spin_Box_Delete_Pos, "XmSimpleSpinBoxDeletePos");
    pragma Import (C, Xm_Simple_Spin_Box_Set_Item, "XmSimpleSpinBoxSetItem");
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Spin_Box.Simple;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.adb ./lib/xm_widgets-manager-spin_box.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.adb  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-spin_box.adb   Thu Dec 26 13:36:40 2002
@@ -53,7 +53,7 @@
      X_Toolkit.Internal;
 package body Xm_Widgets.Manager.Spin_Box is
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Callback_Struct (Pointer : in Xt_Pointer)
@@ -142,7 +142,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Arrow_Orientation, Interfaces.C.signed_char);
 
@@ -167,7 +167,7 @@
          Value => Value'Address);
    end Append_Get;
    pragma Inline (Append_Get);
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 
    function To_Integer is
@@ -245,6 +245,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Spin_Box;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.ads ./lib/xm_widgets-manager-spin_box.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.ads  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-manager-spin_box.ads   Thu Dec 26 13:36:40 2002
@@ -51,7 +51,7 @@
 
 package Xm_Widgets.Manager.Spin_Box is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_Spin_Box_Widget_Class            : constant Widget_Class;
 
@@ -123,7 +123,7 @@
    pragma Convention (C, Append_Get);
 
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    --  specifies whether arrows point horizontally or vertically
    --  if Arrows_Vertical, then
    --   the decrement arrow points downwards, the increment arrow upwards
@@ -142,7 +142,7 @@
             Name  : in Xt_N_Resource_String;
             Value :    out Arrow_Orientation);
    pragma Convention (C, Append_Get);
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_Arrow_Size                : constant Xt_N_Resource_String;
    Xm_N_Default_Arrow_Sensitivity : constant Xt_N_Resource_String;
@@ -238,10 +238,10 @@
       Arrows_Flat_End => 3, Arrows_Flat_Beginning => 4);
    for Arrow_Layout_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    for Arrow_Orientation use (Arrows_Vertical => 0, Arrows_Horizontal => 1);
    for Arrow_Orientation'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    for Position_Type use (Index => 0, Value => 1);
    for Position_Type'Size use Interfaces.C.unsigned_char'Size;
@@ -265,10 +265,10 @@
    Xm_N_Arrow_Layout            : constant Xt_N_Resource_String :=
       To_Resource_String ("arrowLayout");
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Arrow_Orientation       : constant Xt_N_Resource_String :=
       To_Resource_String ("arrowOrientation");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Arrow_Size              : constant Xt_N_Resource_String :=
       To_Resource_String ("arrowSize");
    Xm_N_Default_Arrow_Sensitivity : constant Xt_N_Resource_String :=
@@ -319,6 +319,6 @@
    Xm_N_Wrap                    : constant Xt_N_Resource_String :=
       To_Resource_String ("wrap");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Manager.Spin_Box;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager.ads ./lib/xm_widgets-manager.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-manager.ads   Sat Mar  2 12:17:14 2002
+++ ./lib/xm_widgets-manager.ads    Thu Dec 26 13:36:40 2002
@@ -66,9 +66,9 @@
    Xm_N_Highlight_Color         : constant Xt_N_Resource_String;
    Xm_N_Highlight_Pixmap        : constant Xt_N_Resource_String;
    Xm_N_Initial_Focus           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Layout_Direction        : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Navigation_Type         : constant Xt_N_Resource_String;
 
@@ -85,9 +85,9 @@
    pragma Convention (C, Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String;
    Xm_N_String_Direction        : constant Xt_N_Resource_String;
    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String;
@@ -148,18 +148,18 @@
       To_Resource_String ("highlightPixmap");
    Xm_N_Initial_Focus           : constant Xt_N_Resource_String :=
       To_Resource_String ("initialFocus");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Layout_Direction        : constant Xt_N_Resource_String :=
       To_Resource_String ("layoutDirection");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Navigation_Type         : constant Xt_N_Resource_String :=
       To_Resource_String ("navigationType");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String :=
       To_Resource_String ("popupHandlerCallback");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String :=
       To_Resource_String ("shadowThickness");
    Xm_N_String_Direction        : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-arrow_button.ads ./lib/xm_widgets-primitive-arrow_button.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-arrow_button.ads    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-arrow_button.ads Thu Dec 26 13:36:40 2002
@@ -100,9 +100,9 @@
    pragma Convention (C, Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String;
    Xm_N_Multi_Click             : constant Xt_N_Resource_String;
 
@@ -136,10 +136,10 @@
    Xm_N_Arrow_Direction         : constant Xt_N_Resource_String :=
       To_Resource_String ("arrowDirection");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Detail_Shadow_Thickness;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String :=
       Xm_Widgets.Primitive.Xm_N_Disarm_Callback;
    Xm_N_Multi_Click             : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.adb ./lib/xm_widgets-primitive-icon.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.adb    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-icon.adb Thu Dec 26 13:36:40 2002
@@ -45,7 +45,7 @@
      X_Toolkit.Internal;
 package body Xm_Widgets.Primitive.Icon is
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function Xm_Is_Icon_Gadget (W : in Widget) return Boolean is
@@ -124,6 +124,6 @@
    pragma Inline (Append_Get);
 
    
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Primitive.Icon;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.ads ./lib/xm_widgets-primitive-icon.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.ads    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-icon.ads Thu Dec 26 13:36:40 2002
@@ -42,7 +42,7 @@
 
 package Xm_Widgets.Primitive.Icon is
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_Icon_Gadget_Class                : constant Widget_Class;
 
@@ -62,27 +62,27 @@
    -- resource values
    --
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    -- use a value of Xm_Widgets.Alignment
    --
    Xm_N_Alignment               : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Detail                  : constant Xt_N_Resource_String;
    Xm_N_Detail_Count            : constant Xt_N_Resource_String;
    Xm_N_Font_List               : constant Xt_N_Resource_String;
    Xm_N_Label_String            : constant Xt_N_Resource_String;
    Xm_N_Large_Icon_Mask         : constant Xt_N_Resource_String;
    Xm_N_Large_Icon_Pixmap       : constant Xt_N_Resource_String;
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
    Xm_N_Margin_Width            : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
    Xm_N_Small_Icon_Mask         : constant Xt_N_Resource_String;
    Xm_N_Small_Icon_Pixmap       : constant Xt_N_Resource_String;
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Spacing                 : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_View_Type               : constant Xt_N_Resource_String;
 
@@ -132,10 +132,10 @@
    -- resource values
    --
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Alignment               : constant Xt_N_Resource_String :=
       Xm_Widgets.Primitive.Xm_N_Alignment;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Detail                  : constant Xt_N_Resource_String :=
       To_Resource_String ("detail");
    Xm_N_Detail_Count            : constant Xt_N_Resource_String :=
@@ -148,12 +148,12 @@
       To_Resource_String ("largeIconMask");
    Xm_N_Large_Icon_Pixmap       : constant Xt_N_Resource_String :=
       To_Resource_String ("largeIconPixmap");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Margin_Height           : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Margin_Height;
    Xm_N_Margin_Width            : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Margin_Width;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Render_Table;
    Xm_N_Small_Icon_Mask         : constant Xt_N_Resource_String :=
@@ -161,10 +161,10 @@
    Xm_N_Small_Icon_Pixmap       : constant Xt_N_Resource_String :=
       To_Resource_String ("smallIconPixmap");
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Spacing                 : constant Xt_N_Resource_String :=
       Xm_Widgets.Primitive.Xm_N_Spacing;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_View_Type               : constant Xt_N_Resource_String :=
       To_Resource_String ("viewType");
@@ -172,6 +172,6 @@
    Xm_N_Visual_Emphasis         : constant Xt_N_Resource_String :=
       To_Resource_String ("visualEmphasis");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Primitive.Icon;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.adb ./lib/xm_widgets-primitive-label-toggle_button.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.adb Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-label-toggle_button.adb  Thu Dec 26 13:36:40 2002
@@ -168,7 +168,7 @@
    end Xm_Toggle_Button_Set_State;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Xm_Toggle_Button_Set_Value
      (W      : in Widget;
       State  : in Set_Type;
@@ -200,7 +200,7 @@
          raise Invalid_State_Error;
       end if;
    end Xm_Toggle_Button_Gadget_Set_Value;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
@@ -278,7 +278,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Toggle_Mode_Type, Interfaces.C.unsigned_char);
 
@@ -304,6 +304,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Primitive.Label.Toggle_Button;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.ads ./lib/xm_widgets-primitive-label-toggle_button.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-label-toggle_button.ads  Thu Dec 26 13:36:40 2002
@@ -55,11 +55,11 @@
    --  The new definition is to use the type Set_Type, which is differently
    --  defined for Motif 1.2 and Motif 2.0+
    --
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Set_Type is (Unset, Set, Indeterminate);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    type Set_Type is (Unset, Set);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    type Xm_Toggle_Button_Callback_Struct is record
@@ -120,7 +120,7 @@
       State  : in Boolean;
       Notify : in Boolean);  
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    --  if in two-states (On/Off) mode and Indeterminate is chosen, the exception
    --  Invalid_State_Error is raised
    --
@@ -135,7 +135,7 @@
      (W      : in Widget;
       State  : in Set_Type;
       Notify : in Boolean);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -144,14 +144,14 @@
    --
 
    Xm_N_Arm_Callback            : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String;
    Xm_N_Fill_On_Select          : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Indeterminate_Pixmap    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Indicator_On            : constant Xt_N_Resource_String;
 
    type Indicator_On_Type is (None, Fill,
@@ -170,11 +170,11 @@
    Xm_N_Indicator_Size          : constant Xt_N_Resource_String;
    Xm_N_Indicator_Type          : constant Xt_N_Resource_String;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Indicator_Type is (N_Of_Many, One_Of_Many, One_Of_Many_Round);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    type Indicator_Type is (N_Of_Many, One_Of_Many);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
@@ -200,7 +200,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Spacing                 : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Toggle_Mode             : constant Xt_N_Resource_String;
 
    type Toggle_Mode_Type is (Toggle_Boolean, Toggle_Indeterminate);
@@ -215,19 +215,19 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Unselect_Color          : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String;
    Xm_N_Visible_When_Off        : constant Xt_N_Resource_String;
 
 private
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Set_Type use (Unset => 0, Set => 1, Indeterminate => 2);
    for Set_Type'Size use Interfaces.C.unsigned_char'Size;
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    for Set_Type use (Unset => 0, Set => 1);
 --!    for Set_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    XmINDICATOR_3D_BOX      : constant := 16#01#;
    XmINDICATOR_FLAT_BOX    : constant := 16#02#;
@@ -242,17 +242,17 @@
       Cross_Box => XmINDICATOR_CROSS_GLYPH + XmINDICATOR_3D_BOX);
    for Indicator_On_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Indicator_Type use (N_Of_Many => 1, One_Of_Many => 2, One_Of_Many_Round => 3);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    for Indicator_Type use (N_Of_Many => 1, One_Of_Many => 2);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    for Indicator_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Toggle_Mode_Type use (Toggle_Boolean => 0, Toggle_Indeterminate => 1);
    for Toggle_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    c_const_Xm_Toggle_Button_Widget_Class       : Widget_Class;
@@ -274,18 +274,18 @@
 
    Xm_N_Arm_Callback            : constant Xt_N_Resource_String
       := Xm_Widgets.Primitive.Xm_N_Arm_Callback;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Detail_Shadow_Thickness;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String
       := Xm_Widgets.Primitive.Xm_N_Disarm_Callback;
    Xm_N_Fill_On_Select          : constant Xt_N_Resource_String :=
       To_Resource_String ("fillOnSelect");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Indeterminate_Pixmap    : constant Xt_N_Resource_String :=
       To_Resource_String ("indeterminatePixmap");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Indicator_On            : constant Xt_N_Resource_String :=
       To_Resource_String ("indicatorOn");
 
@@ -305,13 +305,13 @@
 
    Xm_N_Spacing                 : constant Xt_N_Resource_String :=
       Xm_Widgets.Primitive.Xm_N_Spacing;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Toggle_Mode             : constant Xt_N_Resource_String :=
       To_Resource_String ("toggleMode");
 
    Xm_N_Unselect_Color          : constant Xt_N_Resource_String :=
       To_Resource_String ("unselectColor");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Value_Changed_Callback;
    Xm_N_Visible_When_Off        : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label.ads ./lib/xm_widgets-primitive-label.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label.ads   Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-label.ads    Thu Dec 26 13:36:40 2002
@@ -103,9 +103,9 @@
    Xm_N_Mnemonic                : constant Xt_N_Resource_String;
    Xm_N_Mnemonic_Char_Set       : constant Xt_N_Resource_String;
    Xm_N_Recompute_Size          : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_String_Direction        : constant Xt_N_Resource_String;
 
 
@@ -167,10 +167,10 @@
       To_Resource_String ("mnemonicCharSet");
    Xm_N_Recompute_Size          : constant Xt_N_Resource_String :=
       To_Resource_String ("recomputeSize");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Render_Table;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_String_Direction        : constant Xt_N_Resource_String :=
       To_Resource_String ("stringDirection");
 
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.adb ./lib/xm_widgets-primitive-list.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.adb    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-list.adb Thu Dec 26 13:36:40 2002
@@ -311,7 +311,7 @@
    procedure Xm_List_Add_Item_Unselected
      (W    : in Widget;
       Item : in Xm_String;
-      Pos  : in Integer) is
+      Pos  : in Integer := 0) is
    begin
       XmListAddItemUnselected (W, Item, Pos);
    end Xm_List_Add_Item_Unselected;
@@ -321,7 +321,7 @@
    procedure Xm_List_Add_Items_Unselected
      (W     : in Widget;
       Items : in Xm_String_List;
-      Pos   : in Integer) is
+      Pos   : in Integer := 0) is
    begin
       XmListAddItemsUnselected (W, Items (Items'First)'Address, Integer(Items'Length), Pos);
    end Xm_List_Add_Items_Unselected;
@@ -844,7 +844,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Match_Behavior_Type, Interfaces.C.unsigned_char);
 
@@ -920,7 +920,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.ads ./lib/xm_widgets-primitive-list.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.ads    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-list.ads Thu Dec 26 13:36:40 2002
@@ -55,11 +55,11 @@
    type Selection_Type is
      (Initial, Addition, Modification);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Auto_Selection_Type is
      (Auto_Unset, Auto_Begin, Auto_Motion,
       Auto_Cancel, Auto_No_Change, Auto_Change);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    type Xm_List_Callback_Struct is record
       Reason                 : Callback_Reason;
@@ -71,9 +71,9 @@
       Selected_Item_Count    : Integer;
       Selected_Item_Position : System.Address;  -- preliminary, should be Integer_Array_Pointer_Type
       Sel_Type               : Selection_Type;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Auto_Sel_Type          : Auto_Selection_Type;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end record;
    pragma Convention (C, Xm_List_Callback_Struct);
 
@@ -138,12 +138,12 @@
    procedure Xm_List_Add_Item_Unselected
      (W    : in Widget;
       Item : in Xm_String;
-      Pos  : in Integer);
+      Pos  : in Integer := 0);
 
    procedure Xm_List_Add_Items_Unselected
      (W     : in Widget;
       Items : in Xm_String_List;
-      Pos   : in Integer);
+      Pos   : in Integer := 0);
 
 
    -- -------------------------------------------------------------------------
@@ -412,9 +412,9 @@
 
    Xm_N_Browse_Selection_Callback : constant Xt_N_Resource_String;
    Xm_N_Default_Action_Callback   : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Destination_Callback   : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Double_Click_Interval  : constant Xt_N_Resource_String;
    Xm_N_Extended_Selection_Callback : constant Xt_N_Resource_String;
    Xm_N_Font_List              : constant Xt_N_Resource_String;
@@ -437,7 +437,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_List_Spacing           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Match_Behavior         : constant Xt_N_Resource_String;
 
    type Match_Behavior_Type is
@@ -452,9 +452,9 @@
                          Value :    out Match_Behavior_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Multiple_Selection_Callback : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String;
 
    type Primary_Ownership_Type is
@@ -470,7 +470,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Scroll_Bar_Display_Policy : constant Xt_N_Resource_String;
 
    subtype Scroll_Bar_Display_Policy_Type is
@@ -486,12 +486,12 @@
                          Value :    out Scroll_Bar_Display_Policy_Type)
       renames Xm_Widgets.Manager.Scrolled_Window.Append_Get;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Select_Color            : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Selected_Item_Count     : constant Xt_N_Resource_String;
    Xm_N_Selected_Items          : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Selected_Position_Count : constant Xt_N_Resource_String;
    Xm_N_Selected_Positions      : constant Xt_N_Resource_String;
    Xm_N_Selection_Mode          : constant Xt_N_Resource_String;
@@ -507,7 +507,7 @@
                          Value :    out Selection_Mode_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Selection_Policy        : constant Xt_N_Resource_String;
 
@@ -535,18 +535,18 @@
      (Initial => 0, Addition => 1, Modification => 2);
    for Selection_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Auto_Selection_Type use
      (Auto_Unset => 0, Auto_Begin => 1, Auto_Motion => 2,
       Auto_Cancel => 3, Auto_No_Change => 4, Auto_Change => 5);
    for Auto_Selection_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    for List_Size_Policy_Type use
       (Change_All => 0, Change_None => 1, Change_Width => 2, Change_Height => 3);
    for List_Size_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Match_Behavior_Type use
      (None => 0, Quick_Navigate => 1, Invalid_Match_Behavior => 2);
    for Match_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
@@ -557,7 +557,7 @@
 
    for Selection_Mode_Type use (Normal_Mode => 0, Add_Mode => 1);
    for Selection_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    for Selection_Policy_Type use
      (Single_Select => 0, Multiple_Select => 1, Extended_Select => 2, Browse_Select => 3);
@@ -590,10 +590,10 @@
       := To_Resource_String ("browseSelectionCallback");
    Xm_N_Default_Action_Callback   : constant Xt_N_Resource_String
       := To_Resource_String ("defaultActionCallback");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Destination_Callback   : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Destination_Callback;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Double_Click_Interval  : constant Xt_N_Resource_String
       := To_Resource_String ("doubleClickInterval");
    Xm_N_Extended_Selection_Callback : constant Xt_N_Resource_String
@@ -613,32 +613,32 @@
 
    Xm_N_List_Spacing           : constant Xt_N_Resource_String
       := To_Resource_String ("listSpacing");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Match_Behavior         : constant Xt_N_Resource_String
       := To_Resource_String ("matchBehavior");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Multiple_Selection_Callback : constant Xt_N_Resource_String
       := To_Resource_String ("multipleSelectionCallback");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Primary_Ownership;
 
    Xm_N_Render_Table            : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_Render_Table;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Scroll_Bar_Display_Policy : constant Xt_N_Resource_String :=
       Xm_Widgets.Manager.Scrolled_Window.Xm_N_Scroll_Bar_Display_Policy;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Select_Color            : constant Xt_N_Resource_String
       := To_Resource_String ("selectColor");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Selected_Item_Count     : constant Xt_N_Resource_String
       := To_Resource_String ("selectedItemCount");
    Xm_N_Selected_Items          : constant Xt_N_Resource_String
       := To_Resource_String ("selectedItems");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Selected_Position_Count : constant Xt_N_Resource_String
       := To_Resource_String ("selectedPositionCount");
    Xm_N_Selected_Positions      : constant Xt_N_Resource_String
@@ -646,7 +646,7 @@
    Xm_N_Selection_Mode          : constant Xt_N_Resource_String
       := To_Resource_String ("selectionMode");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Selection_Policy        : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Selection_Policy;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.adb ./lib/xm_widgets-primitive-scroll_bar.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.adb  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-scroll_bar.adb   Thu Dec 26 13:36:40 2002
@@ -185,7 +185,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Slider_Mark_Type, Interfaces.C.unsigned_char);
 
@@ -261,6 +261,6 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 end Xm_Widgets.Primitive.Scroll_Bar;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.ads ./lib/xm_widgets-primitive-scroll_bar.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.ads  Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-scroll_bar.ads   Thu Dec 26 13:36:40 2002
@@ -103,9 +103,9 @@
 
    Xm_N_Decrement_Callback      : constant Xt_N_Resource_String;
    Xm_N_Drag_Callback           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Editable                : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Increment               : constant Xt_N_Resource_String;
    Xm_N_Increment_Callback      : constant Xt_N_Resource_String;
    Xm_N_Initial_Delay           : constant Xt_N_Resource_String;
@@ -149,7 +149,7 @@
                          Value :    out Show_Arrows_Type);
    pragma Convention (C, Append_Get);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Mark             : constant Xt_N_Resource_String;
 
    type Slider_Mark_Type is (None, Etched_Line, Thumb_Mark, Round_Mark);
@@ -163,11 +163,11 @@
                          Value :    out Slider_Mark_Type);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Slider_Size             : constant Xt_N_Resource_String;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Visual           : constant Xt_N_Resource_String;
 
    type Slider_Visual_Type is (Background_Color, 
@@ -199,7 +199,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Snap_Back_Multiple      : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_To_Bottom_Callback      : constant Xt_N_Resource_String;
    Xm_N_To_Top_Callback         : constant Xt_N_Resource_String;
    Xm_N_Through_Color           : constant Xt_N_Resource_String;
@@ -217,7 +217,7 @@
    for Show_Arrows_Type use (None => 0, Each_Side => 1, Max_Side => 2, Min_Side => 3);
    for Show_Arrows_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Slider_Mark_Type use (None => 0, Etched_Line => 1, Thumb_Mark => 2, Round_Mark => 3);
    for Slider_Mark_Type'Size use Interfaces.C.unsigned_char'Size;
 
@@ -229,7 +229,7 @@
                                Through_Color   => 2,
                                Shadowed_Background => 3);
    for Slider_Visual_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    c_const_Xm_Scroll_Bar_Widget_Class          : Widget_Class;
@@ -249,10 +249,10 @@
       To_Resource_String ("decrementCallback");
    Xm_N_Drag_Callback           : constant Xt_N_Resource_String :=
       To_Resource_String ("dragCallback");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Editable                : constant Xt_N_Resource_String :=
       To_Resource_String ("editable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Increment               : constant Xt_N_Resource_String :=
       To_Resource_String ("increment");
    Xm_N_Increment_Callback      : constant Xt_N_Resource_String :=
@@ -280,16 +280,16 @@
    Xm_N_Show_Arrows             : constant Xt_N_Resource_String :=
       To_Resource_String ("showArrows");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Mark             : constant Xt_N_Resource_String :=
       To_Resource_String ("sliderMark");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Slider_Size             : constant Xt_N_Resource_String :=
       To_Resource_String ("sliderSize");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Slider_Visual           : constant Xt_N_Resource_String :=
       To_Resource_String ("sliderVisual");
    Xm_N_Sliding_Mode            : constant Xt_N_Resource_String :=
@@ -297,7 +297,7 @@
 
    Xm_N_Snap_Back_Multiple      : constant Xt_N_Resource_String :=
       To_Resource_String ("snapBackMultiple");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_To_Bottom_Callback      : constant Xt_N_Resource_String :=
       To_Resource_String ("toBottomCallback");
    Xm_N_To_Top_Callback         : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.adb ./lib/xm_widgets-primitive-text-data_field.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.adb Thu Jan  1 01:00:00 1970
+++ ./lib/xm_widgets-primitive-text-data_field.adb  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,457 @@
+-------------------------------------------------------------------------------
+--                                                                           --
+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
+--  This file also copyright (c) 2002 Vadim Godunko                          --
+--                                                                           --
+--  Adabindx is free software; you can redistribute it and/or modify it      --
+--  under the terms of the GNU General Public License as published by the    --
+--  Free Software Foundation; either version 2 of the License, or (at your   --
+--  option) any later version.                                               --
+--                                                                           --
+--  This program is distributed in the hope that it will be useful, but      --
+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
+--  See the GNU General Public License for more details.                     --
+--                                                                           --
+--  You should have received a copy of the GNU General Public License        --
+--  along with this program; if not, write to the                            --
+--  Free Software Foundation, Inc.,                                          --
+--  59 Temple Place - Suite 330,                                             --
+--  Boston, MA 02111-1307, USA.                                              --
+--                                                                           --
+--  As a special exception, if other files instantiate generics from this    --
+--  unit, or you link this unit with other files to produce an executable,   --
+--  this unit does not by itself cause the resulting executable to be        --
+--  covered by the GNU General Public License. This exception does not       --
+--  however invalidate any other reasons why the executable file might be    --
+--  covered by the GNU General Public License.                               --
+--                                                                           --
+--  X Window System is copyrighted by the X Consortium                       --
+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
+--                  and by The Open Group                                    --
+--                                                                           --
+--                                                                           --
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+--
+-- HISTORY:
+--          2002-10-17  Vadim Godunko: first definition of this file
+--
+-------------------------------------------------------------------------------
+with Interfaces.C;
+with Interfaces.C.Strings;
+with Interfaces.C.Wstrings;
+
+with X_Toolkit.Internal;
+
+
+package body Xm_Widgets.Primitive.Text.Data_Field is
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> XtFree
+   --!    <Purpose>
+   --!    <Exceptions>
+   ---------------------------------------------------------------------------
+   procedure XtFree (Value : in Interfaces.C.Strings.chars_ptr);
+   procedure XtFree (Value : in Interfaces.C.Wstrings.wchars_ptr);
+   pragma Import (C, XtFree,"XtFree");
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Create_Data_Field
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Create_Data_Field (Parent  : in Widget;
+                                  Name    : in String;
+                                  Arglist : in Arg_List := Null_Arg_List)
+     return Widget is
+      function XmCreateDataField
+         (Parent : in Widget;
+          Name   : in Interfaces.C.char_array;
+          Args   : in X_Toolkit.Internal.Arg_Rec_Access;
+          Count  : in Cardinal)
+        return Widget;
+      pragma Import (C, XmCreateDataField, "XmCreateDataField");
+   begin
+      return XmCreateDataField (Parent,
+                                Interfaces.C.To_C (Name),
+                                X_Toolkit.Internal.Hook (Arglist),
+                                Cardinal (Length (Arglist)));
+   end Xm_Create_Data_Field;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Copy
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Copy (W         : in Widget;
+                                 Clip_Time : in X_Lib.Server_Time) is
+      function XmDataFieldCopy (W         : in Widget;
+                                Clip_Time : in X_Lib.Server_Time)
+        return Xt_Boolean;
+      pragma Import (C, XmDataFieldCopy, "XmDataFieldCopy");
+   begin
+      if XmDataFieldCopy (W, Clip_Time) = Xt_Boolean'(False) then
+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
+      end if;
+   end Xm_Data_Field_Copy;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Cut
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Cut (W         : in Widget;
+                                Clip_Time : in X_Lib.Server_Time) is
+      function XmDataFieldCut (W         : in Widget;
+                               Clip_Time : in X_Lib.Server_Time)
+        return Xt_Boolean;
+      pragma Import (C, XmDataFieldCut, "XmDataFieldCut");
+   begin
+      if XmDataFieldCut (W, Clip_Time) = Xt_Boolean'(False) then
+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
+      end if;
+   end Xm_Data_Field_Cut;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_Add_Mode
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_Add_Mode (W : in Widget) return Boolean is
+      function XmDataFieldGetAddMode (W : in Widget) return Xt_Boolean;
+      pragma Import (C, XmDataFieldGetAddMode, "XmDataFieldGetAddMode");
+   begin
+      return XmDataFieldGetAddMode (W) /= Xt_Boolean'(False);
+   end Xm_Data_Field_Get_Add_Mode;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_Editable
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_Editable (W : in Widget) return Boolean is
+      function XmDataFieldGetEditable (W : in Widget) return Xt_Boolean;
+      pragma Import (C, XmDataFieldGetEditable, "XmDataFieldGetEditable");
+   begin
+      return XmDataFieldGetEditable (W) /= Xt_Boolean'(False);
+   end Xm_Data_Field_Get_Editable;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_Selection
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_Selection (W : in Widget) return String is
+      function XmDataFieldGetSelection (W : in Widget)
+        return Interfaces.C.Strings.chars_ptr;
+      pragma Import (C, XmDataFieldGetSelection, "XmDataFieldGetSelection");
+
+      X_S : Interfaces.C.Strings.chars_ptr;
+   begin
+      X_S := XmDataFieldGetSelection (W);
+      declare
+         Result : constant String := Interfaces.C.Strings.Value (X_S);
+      begin
+         XtFree (X_S);
+         return Result;
+      end;
+   end Xm_Data_Field_Get_Selection;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_Selection
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_Selection (W : in Widget) return Wide_String is
+      function XmDataFieldGetSelectionWcs (W : in Widget)
+        return Interfaces.C.Wstrings.wchars_ptr;
+      pragma Import (C, XmDataFieldGetSelectionWcs,
+                     "XmDataFieldGetSelectionWcs");
+
+      X_S : Interfaces.C.Wstrings.wchars_ptr;
+   begin
+      X_S := XmDataFieldGetSelectionWcs (W);
+      declare
+         Result : constant Wide_String := Interfaces.C.Wstrings.Value (X_S);
+      begin
+         XtFree (X_S);
+         return Result;
+      end;
+   end Xm_Data_Field_Get_Selection;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_String
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_String (W : in Widget) return String is
+      function XmDataFieldGetString (W : in Widget)
+        return Interfaces.C.Strings.chars_ptr;
+      pragma Import (C, XmDataFieldGetString, "XmDataFieldGetString");
+
+      X_S : Interfaces.C.Strings.chars_ptr;
+   begin
+      X_S := XmDataFieldGetString (W);
+      declare
+         Result : constant String := Interfaces.C.Strings.Value (X_S);
+      begin
+         XtFree (X_S);
+         return Result;
+      end;
+   end Xm_Data_Field_Get_String;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Get_String
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Data_Field_Get_String (W : in Widget) return Wide_String is
+      function XmDataFieldGetStringWcs (W : in Widget)
+        return Interfaces.C.Wstrings.wchars_ptr;
+      pragma Import (C, XmDataFieldGetStringWcs, "XmDataFieldGetStringWcs");
+
+      X_S : Interfaces.C.Wstrings.wchars_ptr;
+   begin
+      X_S := XmDataFieldGetStringWcs (W);
+      declare
+         Result : constant Wide_String := Interfaces.C.Wstrings.Value (X_S);
+      begin
+         XtFree (X_S);
+         return Result;
+      end;
+   end Xm_Data_Field_Get_String;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Insert
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Insert (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   Value    : in String) is
+      procedure XmDataFieldInsert (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   Value    : in Interfaces.C.char_array);
+      pragma Import (C, XmDataFieldInsert, "XmDataFieldInsert");
+   begin
+      XmDataFieldInsert (W, Position, Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Insert;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Insert
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Insert (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   Value    : in Wide_String) is
+      procedure XmDataFieldInsertWcs (W        : in Widget;
+                                      Position : in Xm_Text_Position;
+                                      Value    : in Interfaces.C.wchar_array);
+      pragma Import (C, XmDataFieldInsertWcs, "XmDataFieldInsertWcs");
+   begin
+      XmDataFieldInsertWcs (W, Position, Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Insert;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Paste
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Paste (W : in Widget) is
+      function XmDataFieldPaste (W : in Widget) return Xt_Boolean;
+      pragma Import (C, XmDataFieldPaste, "XmDataFieldPaste");
+   begin
+      if XmDataFieldPaste (W) = Xt_Boolean'(False) then
+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
+      end if;
+   end Xm_Data_Field_Paste;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Pos_To_XY
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Pos_To_XY (W        : in     Widget;
+                                      Position : in     Xm_Text_Position;
+                                      X        :    out X_Lib.Position;
+                                      Y        :    out X_Lib.Position) is
+      function XmDataFieldPosToXY (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   X        : in System.Address;
+                                   Y        : in System.Address)
+        return Xt_Boolean;
+      pragma Import (C, XmDataFieldPosToXY, "XmDataFieldPosToXY");
+   begin
+      if XmDataFieldPosToXY (W, Position, X'Address, Y'Address) =
+        Xt_Boolean'(False)
+      then
+         raise Xm_Data_Field_Not_In_Data_Field_Widget;
+      end if;
+   end Xm_Data_Field_Pos_To_XY;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Replace
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Replace (W             : in Widget;
+                                    From_Position : in Xm_Text_Position;
+                                    To_Position   : in Xm_Text_Position;
+                                    Value         : in String) is
+      procedure XmDataFieldReplace
+       (W             : in Widget;
+        From_Position : in Xm_Text_Position;
+        To_Position   : in Xm_Text_Position;
+        Value         : in Interfaces.C.char_array);
+      pragma Import (C, XmDataFieldReplace, "XmDataFieldReplace");
+   begin
+      XmDataFieldReplace (W, From_Position, To_Position,
+                          Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Replace;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Replace
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Replace (W             : in Widget;
+                                    From_Position : in Xm_Text_Position;
+                                    To_Position   : in Xm_Text_Position;
+                                    Value         : in Wide_String) is
+      procedure XmDataFieldReplaceWcs
+       (W             : in Widget;
+        From_Position : in Xm_Text_Position;
+        To_Position   : in Xm_Text_Position;
+        Value         : in Interfaces.C.wchar_array);
+      pragma Import (C, XmDataFieldReplaceWcs, "XmDataFieldReplaceWcs");
+   begin
+      XmDataFieldReplaceWcs (W, From_Position, To_Position,
+                             Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Replace;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Set_Add_Mode
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Set_Add_Mode (W     : in Widget;
+                                         State : in Boolean) is
+      procedure XmDataFieldSetAddMode (W     : in Widget;
+                                       State : in Xt_Boolean);
+      pragma Import (C, XmDataFieldSetAddMode, "XmDataFieldSetAddMode");
+   begin
+      XmDataFieldSetAddMode (W, To_Xt_Boolean (State));
+   end Xm_Data_Field_Set_Add_Mode;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Set_Editable
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Set_Editable (W        : in Widget;
+                                         Editable : in Boolean) is
+      procedure XmDataFieldSetEditable (W        : in Widget;
+                                        Editable : in Xt_Boolean);
+      pragma Import (C, XmDataFieldSetEditable, "XmDataFieldSetEditable");
+   begin
+      XmDataFieldSetEditable (W, To_Xt_Boolean (Editable));
+   end Xm_Data_Field_Set_Editable;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Set_String
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Set_String (W     : in Widget;
+                                       Value : in String) is
+      procedure XmDataFieldSetString(W     : in Widget;
+                                     Value : in Interfaces.C.char_array);
+      pragma Import (C, XmDataFieldSetString,"XmDataFieldSetString");
+   begin
+      XmDataFieldSetString (W, Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Set_String;
+
+
+--   ---------------------------------------------------------------------------
+--   --! <Subprogram>
+--   --!    <Unit> Xm_Data_Field_Set_String
+--   --!    <Implementation_Notes>
+--   ---------------------------------------------------------------------------
+--   procedure Xm_Data_Field_Set_String (W     : in Widget;
+--                                       Value : in Wide_String) is
+--      procedure XmDataFieldSetStringWcs (W     : in Widget;
+                                     Value : in Interfaces.C.char_array);
+      pragma Import (C, XmDataFieldSetString,"XmDataFieldSetString");
+   begin
+      XmDataFieldSetString (W, Interfaces.C.To_C (Value));
+   end Xm_Data_Field_Set_String;
+
+
+--   ---------------------------------------------------------------------------
+--   --! <Subprogram>
+--   --!    <Unit> Xm_Data_Field_Set_String
+--   --!    <Implementation_Notes>
+--   ---------------------------------------------------------------------------
+--   procedure Xm_Data_Field_Set_String (W     : in Widget;
+--                                       Value : in Wide_String) is
+--      procedure XmDataFieldSetStringWcs (W     : in Widget;
+--                                         Value : in Interfaces.C.wchar_array);
+--      pragma Import (C, XmDataFieldSetStringWcs,"XmDataFieldSetStringWcs");
+--   begin
+---- UseGnat3.13p
+----!       --  the GNAT 3.13p runtime (and possibly earlies ones as well) raise
+----!       --  STORAGE_ERROR for Value with 'Length = 0
+----!       --  This is a workaround to this problem
+----!       --
+----!       if Value'Length = 0 then
+----!          declare
+----!             Value_String : constant Interfaces.C.Wchar_Array (0 .. 0) :=
+----!               (others => Interfaces.C.wide_nul);
+----!          begin
+----!             XmDataFieldSetStringWcs (W, Value_String);
+----!          end;
+----!       else
+----!          XmDataFieldSetStringWcs (W, Interfaces.C.To_C (Value));
+----!       end if;
+---- NotGnat3.13p
+--      XmDataFieldSetStringWcs (W, Interfaces.C.To_C (Value));
+---- EndGnat3.13p
+--   end Xm_Data_Field_Set_String;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Is_Data_Field
+   --!    <Implementation_Notes>
+   ---------------------------------------------------------------------------
+   function Xm_Is_Data_Field (W : in Widget) return Boolean is
+   begin
+      return Xt_Is_Subclass (W, Xm_Data_Field_Widget_Class);
+   end Xm_Is_Data_Field;
+
+
+end Xm_Widgets.Primitive.Text.Data_Field;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.ads ./lib/xm_widgets-primitive-text-data_field.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.ads Thu Jan  1 01:00:00 1970
+++ ./lib/xm_widgets-primitive-text-data_field.ads  Thu Dec 26 13:36:40 2002
@@ -0,0 +1,250 @@
+-------------------------------------------------------------------------------
+--                                                                           --
+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
+--  This file also copyright (c) 2002 Vadim Godunko                          --
+--                                                                           --
+--  Adabindx is free software; you can redistribute it and/or modify it      --
+--  under the terms of the GNU General Public License as published by the    --
+--  Free Software Foundation; either version 2 of the License, or (at your   --
+--  option) any later version.                                               --
+--                                                                           --
+--  This program is distributed in the hope that it will be useful, but      --
+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
+--  See the GNU General Public License for more details.                     --
+--                                                                           --
+--  You should have received a copy of the GNU General Public License        --
+--  along with this program; if not, write to the                            --
+--  Free Software Foundation, Inc.,                                          --
+--  59 Temple Place - Suite 330,                                             --
+--  Boston, MA 02111-1307, USA.                                              --
+--                                                                           --
+--  As a special exception, if other files instantiate generics from this    --
+--  unit, or you link this unit with other files to produce an executable,   --
+--  this unit does not by itself cause the resulting executable to be        --
+--  covered by the GNU General Public License. This exception does not       --
+--  however invalidate any other reasons why the executable file might be    --
+--  covered by the GNU General Public License.                               --
+--                                                                           --
+--  X Window System is copyrighted by the X Consortium                       --
+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
+--                  and by The Open Group                                    --
+--                                                                           --
+--                                                                           --
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+--
+-- HISTORY:
+--          2002-10-13  Vadim Godunko: first definition of this file
+--
+-------------------------------------------------------------------------------
+
+package Xm_Widgets.Primitive.Text.Data_Field is
+
+--UseOpenMotif2.2
+
+   Xm_Data_Field_Widget_Class : constant Widget_Class;
+
+   type Xm_Data_Field_Callback_Struct is record
+      W    : Widget;
+      Text : X_Strings.X_String;
+      Doit : Boolean;
+   end record;
+   pragma Convention (C, Xm_Data_Field_Callback_Struct);
+
+   type Xm_Data_Field_Callback_Struct_Access is
+     access all Xm_Data_Field_Callback_Struct;
+
+
+   Xm_Data_Field_Dont_Own_Primary_Selection : exception;
+   Xm_Data_Field_Not_In_Data_Field_Widget   : exception;
+
+
+   function Xm_Is_Data_Field (W : in Widget) return Boolean;
+
+   function Xm_Create_Data_Field (Parent  : in Widget;
+                                  Name    : in String;
+                                  Arglist : in Arg_List := Null_Arg_List)
+     return Widget;
+
+   procedure Xm_Data_Field_Set_String (W     : in Widget;
+                                       Value : in String);
+
+   --  procedure Xm_Data_Field_Set_String (W     : in Widget;
+   --                                      Value : in Wide_String);
+
+   function Xm_Data_Field_Get_String (W : in Widget) return String;
+
+   function Xm_Data_Field_Get_String (W : in Widget) return Wide_String;
+
+   --  Xm_Data_Field_Get_Substring
+   --  Xm_Data_Field_Get_Substring_Wcs
+
+   function Xm_Data_Field_Get_Last_Position (W : in Widget)
+     return Xm_Text_Position;
+
+   procedure Xm_Data_Field_Replace (W             : in Widget;
+                                    From_Position : in Xm_Text_Position;
+                                    To_Position   : in Xm_Text_Position;
+                                    Value         : in String);
+
+   procedure Xm_Data_Field_Replace (W             : in Widget;
+                                    From_Position : in Xm_Text_Position;
+                                    To_Position   : in Xm_Text_Position;
+                                    Value         : in Wide_String);
+
+   procedure Xm_Data_Field_Insert (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   Value    : in String);
+
+   procedure Xm_Data_Field_Insert (W        : in Widget;
+                                   Position : in Xm_Text_Position;
+                                   Value    : in Wide_String);
+
+   procedure Xm_Data_Field_Set_Add_Mode (W     : in Widget;
+                                         State : in Boolean);
+
+   function Xm_Data_Field_Get_Add_Mode (W : in Widget) return Boolean;
+
+   procedure Xm_Data_Field_Set_Highlight (W      : in Widget;
+                                          Left   : in Xm_Text_Position;
+                                          Right  : in Xm_Text_Position;
+                                          Mode   : in Xm_Highlight_Mode);
+
+   function Xm_Data_Field_Get_Editable (W : in Widget) return Boolean;
+
+   procedure Xm_Data_Field_Set_Editable (W        : in Widget;
+                                         Editable : in Boolean);
+
+   function Xm_Data_Field_Get_Max_Length (W : in Widget) return Integer;
+
+   procedure Xm_Data_Field_Set_Max_Length (W          : in Widget;
+                                           Max_Length : in Integer);
+
+   function Xm_Data_Field_Get_Cursor_Position (W : in Widget)
+     return Xm_Text_Position;
+
+   function Xm_Data_Field_Get_Insertion_Position (W : in Widget)
+     return Xm_Text_Position;
+
+   procedure Xm_Data_Field_Set_Insertion_Position
+    (W        : in Widget;
+     Position : in Xm_Text_Position);
+
+   function Xm_Data_Field_Get_Selection (W : in Widget) return String;
+
+   function Xm_Data_Field_Get_Selection (W : in Widget) return Wide_String;
+
+   procedure Xm_Data_Field_Set_Selection (W     : in Widget;
+                                          First : in Xm_Text_Position;
+                                          Last  : in Xm_Text_Position;
+                                          Time  : in X_Lib.Server_Time);
+
+   procedure Xm_Data_Field_Get_Selection_Position
+    (W     : in     Widget;
+     Left  :    out Xm_Text_Position;
+     Right :    out Xm_Text_Position);
+
+   function Xm_Data_Field_XY_To_Pos (W : in Widget;
+                                     X : in X_Lib.Position;
+                                     Y : in X_Lib.Position)
+     return Xm_Text_Position;
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Pos_To_XY
+   --!    <Purpose>
+   --!    <Exceptions>
+   --!       Xm_Data_Field_Not_In_Data_Field_Widget - character position
+   --!     not displayed in widget.
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Pos_To_XY (W        : in     Widget;
+                                      Position : in     Xm_Text_Position;
+                                      X        :    out X_Lib.Position;
+                                      Y        :    out X_Lib.Position);
+
+
+   procedure Xm_Data_Field_Show_Position (W        : in Widget;
+                                          Position : in Xm_Text_Position);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Cut
+   --!    <Purpose>
+   --!    <Exceptions>
+   --!       Xm_Data_Field_Donr_Own_Primary_Selection
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Cut (W         : in Widget;
+                                Clip_Time : in X_Lib.Server_Time);
+
+
+   ---------------------------------------------------------------------------
+   --! <Subprogram>
+   --!    <Unit> Xm_Data_Field_Copy
+   --!    <Purpose>
+   --!    <Exceptions>
+   --!       Xm_Data_Field_Donr_Own_Primary_Selection
+   ---------------------------------------------------------------------------
+   procedure Xm_Data_Field_Copy (W         : in Widget;
+                                 Clip_Time : in X_Lib.Server_Time);
+
+
+   procedure Xm_Data_Field_Paste (W : in Widget);
+
+   function Xm_Data_Field_Get_Baseline (W : in Widget) return Integer;
+
+
+   Xm_N_Alignment              : constant Xt_N_Resource_String;
+   Xm_N_Auto_Fill              : constant Xt_N_Resource_String;
+   Xm_N_Picture                : constant Xt_N_Resource_String;
+   Xm_N_Picture_Error_Callback : constant Xt_N_Resource_String;
+   Xm_N_Validate_Callback      : constant Xt_N_Resource_String;
+
+
+private
+
+   c_const_Xm_Data_Field_Widget_Class : Widget_Class;
+   pragma Import (C, c_const_Xm_Data_Field_Widget_Class,
+                  "xmDataFieldWidgetClass");
+
+   Xm_Data_Field_Widget_Class : constant Widget_Class :=
+     c_const_Xm_Data_Field_Widget_Class;
+
+
+   Xm_N_Alignment              : constant Xt_N_Resource_String :=
+     Xm_Widgets.Primitive.Xm_N_Alignment;
+   Xm_N_Auto_Fill              : constant Xt_N_Resource_String :=
+     To_Resource_String ("autoFill");
+   Xm_N_Picture                : constant Xt_N_Resource_String :=
+     To_Resource_String ("picture");
+   Xm_N_Picture_Error_Callback : constant Xt_N_Resource_String :=
+     To_Resource_String ("pictureErrorCallback");
+   Xm_N_Validate_Callback      : constant Xt_N_Resource_String :=
+     To_Resource_String ("validateCallback");
+
+
+   pragma Import (C, Xm_Data_Field_Get_Baseline,"XmDataFieldGetBaseline");
+   pragma Import (C, Xm_Data_Field_Get_Cursor_Position,
+                  "XmDataFieldGetCursorPosition");
+   pragma Import (C, Xm_Data_Field_Get_Insertion_Position,
+                  "XmDataFieldGetInsertionPosition");
+   pragma Import (C, Xm_Data_Field_Get_Last_Position,
+                  "XmDataFieldGetLastPosition");
+   pragma Import (C, Xm_Data_Field_Get_Max_Length, "XmDataFieldGetMaxLength");
+   pragma Import (C, Xm_Data_Field_Get_Selection_Position,
+                  "XmDataFieldGetSelectionPosition");
+   pragma Import (C, Xm_Data_Field_Set_Highlight, "XmDataFieldSetHighlight");
+   pragma Import (C, Xm_Data_Field_Set_Insertion_Position,
+                  "XmDataFieldSetInsertionPosition");
+   pragma Import (C, Xm_Data_Field_Set_Max_Length, "XmDataFieldSetMaxLength");
+   pragma Import (C, Xm_Data_Field_Set_Selection, "XmDataFieldSetSelection");
+   pragma Import (C, Xm_Data_Field_Show_Position, "XmDataFieldShowPosition");
+   pragma Import (C, Xm_Data_Field_XY_To_Pos, "XmDataFieldXYToPos");
+
+--EndOpenMotif2.2
+
+end Xm_Widgets.Primitive.Text.Data_Field;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.adb ./lib/xm_widgets-primitive-text.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.adb    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-text.adb Thu Dec 26 13:36:40 2002
@@ -494,7 +494,7 @@
       function XmTextGetAddMode (W : in Widget) return Xt_Boolean;
       pragma Import (C, XmTextGetAddMode, "XmTextGetAddMode");
    begin
-      return XmTextGetAddMode (W) = Xt_Boolean'(True);
+      return XmTextGetAddMode (W) /= Xt_Boolean'(False);
    end Xm_Text_Get_Add_Mode;
 
 
@@ -502,7 +502,7 @@
       function XmTextFieldGetAddMode (W : in Widget) return Xt_Boolean;
       pragma Import (C, XmTextFieldGetAddMode, "XmTextFieldGetAddMode");
    begin
-      return XmTextFieldGetAddMode (W) = Xt_Boolean'(True);
+      return XmTextFieldGetAddMode (W) /= Xt_Boolean'(False);
    end Xm_Text_Field_Get_Add_Mode;
 -- EndLesstif
 
@@ -561,7 +561,7 @@
       function XmTextGetEditable (W : in Widget) return Xt_Boolean;
       pragma Import (C, XmTextGetEditable, "XmTextGetEditable");
    begin
-      return XmTextGetEditable (W) = Xt_Boolean'(True);
+      return XmTextGetEditable (W) /= Xt_Boolean'(False);
    end Xm_Text_Get_Editable;
 
 
@@ -569,7 +569,7 @@
       function XmTextFieldGetEditable (W : in Widget) return Xt_Boolean;
       pragma Import (C, XmTextFieldGetEditable, "XmTextFieldGetEditable");
    begin
-      return XmTextFieldGetEditable (W) = Xt_Boolean'(True);
+      return XmTextFieldGetEditable (W) /= Xt_Boolean'(False);
    end Xm_Text_Field_Get_Editable;
 
 
@@ -721,7 +721,7 @@
 
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Xm_Text_Copy_Link
      (W         : in Widget;
       Clip_Time : in X_Lib.Server_Time) is
@@ -750,7 +750,7 @@
          raise Xm_Text_Error_Dont_Own_Primary_Selection;
       end if;
    end Xm_Text_Field_Copy_Link;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 
@@ -805,7 +805,7 @@
    end Xm_Text_Field_Paste;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Xm_Text_Paste_Link (W : in Widget) is
       function XmTextPasteLink (W : in Widget) return Xt_Boolean;
       pragma Import (C, XmTextPasteLink, "XmTextPasteLink");
@@ -824,7 +824,7 @@
          raise Xm_Text_Error_Dont_Own_Primary_Selection;
       end if;
    end Xm_Text_Field_Paste_Link;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.ads ./lib/xm_widgets-primitive-text.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.ads    Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive-text.ads Thu Dec 26 13:36:40 2002
@@ -268,14 +268,14 @@
       Clip_Time : in X_Lib.Server_Time);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Xm_Text_Copy_Link
      (W         : in Widget;
       Clip_Time : in X_Lib.Server_Time);
    procedure Xm_Text_Field_Copy_Link
      (W         : in Widget;
       Clip_Time : in X_Lib.Server_Time);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    procedure Xm_Text_Cut
@@ -290,10 +290,10 @@
    procedure Xm_Text_Field_Paste (W : in Widget);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Xm_Text_Paste_Link (W : in Widget);
    procedure Xm_Text_Field_Paste_Link (W : in Widget);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    procedure Xm_Text_Clear_Selection
@@ -406,9 +406,9 @@
    --
    Xm_N_Cursor_Position_Visible : constant Xt_N_Resource_String;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Destination_Callback    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    -- for Xm_N_Editable use False or True
    --
@@ -450,9 +450,9 @@
    --
    Xm_N_Top_Character           : constant Xt_N_Resource_String;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Total_Lines             : constant Xt_N_Resource_String;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    Xm_N_Value                   : constant Xt_N_Resource_String;
    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String;
@@ -480,9 +480,9 @@
    Xm_N_Blink_Rate              : constant Xt_N_Resource_String;
    Xm_N_Columns                 : constant Xt_N_Resource_String;
    Xm_N_Font_List               : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    -- for Xm_N_Resize_Height use False or True
    --
@@ -578,10 +578,10 @@
       To_Resource_String ("cursorPosition");
    Xm_N_Cursor_Position_Visible : constant Xt_N_Resource_String :=
       To_Resource_String ("cursorPositionVisible");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Destination_Callback;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Editable                : constant Xt_N_Resource_String :=
       To_Resource_String ("editable");
    Xm_N_Edit_Mode               : constant Xt_N_Resource_String :=
@@ -611,10 +611,10 @@
       To_Resource_String ("motionVerifyCallback");
    Xm_N_Pending_Delete          : constant Xt_N_Resource_String :=
       To_Resource_String ("pendingDelete");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
       Xm_Widgets.Xm_N_Render_Table;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Resize_Height           : constant Xt_N_Resource_String :=
       To_Resource_String ("resizeHeight");
    Xm_N_Resize_Width            : constant Xt_N_Resource_String :=
@@ -639,10 +639,10 @@
       To_Resource_String ("source");
    Xm_N_Top_Character           : constant Xt_N_Resource_String :=
       To_Resource_String ("topCharacter");
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    Xm_N_Total_Lines             : constant Xt_N_Resource_String :=
       To_Resource_String ("totalLines");
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    Xm_N_Value                   : constant Xt_N_Resource_String :=
       X_Toolkit.Xt_N_Value;
    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive.ads ./lib/xm_widgets-primitive.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-primitive.ads  Thu Dec 26 13:36:40 2002
@@ -38,6 +38,7 @@
 -- HISTORY:
 --          June 20, 1998 begin of history
 --          06 Aug 2001 Vadim Godunko: move Xm_Change_Color to Xm_Widgets
+--          2002-03-22 Vadim Godunko: added resource Xm_N_Tool_Tip_String
 --
 -------------------------------------------------------------------------------
 
@@ -76,18 +77,18 @@
 
    Xm_N_Bottom_Shadow_Color     : constant Xt_N_Resource_String;
    Xm_N_Bottom_Shadow_Pixmap    : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Foreground              : constant Xt_N_Resource_String;
    Xm_N_Help_Callback           : constant Xt_N_Resource_String;
    Xm_N_Highlight_Color         : constant Xt_N_Resource_String;
    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String;
    Xm_N_Highlight_Pixmap        : constant Xt_N_Resource_String;
    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Layout_Direction        : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Navigation_Type         : constant Xt_N_Resource_String;
 
@@ -104,10 +105,13 @@
    pragma Convention (C, Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String;
+-- UseOpenMotif2.2
+   Xm_N_Tool_Tip_String     : constant Xt_N_Resource_String;
+-- EndOpenMotif2.2
    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String;
    Xm_N_Top_Shadow_Pixmap       : constant Xt_N_Resource_String;
    Xm_N_Traversal_On            : constant Xt_N_Resource_String;
@@ -161,10 +165,10 @@
       To_Resource_String ("bottomShadowColor");
    Xm_N_Bottom_Shadow_Pixmap    : constant Xt_N_Resource_String :=
       To_Resource_String ("bottomShadowPixmap");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
       To_Resource_String ("convertCallback");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Foreground              : constant Xt_N_Resource_String :=
       To_Resource_String ("foreground");
    Xm_N_Help_Callback           : constant Xt_N_Resource_String :=
@@ -177,20 +181,24 @@
       To_Resource_String ("highlightPixmap");
    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String :=
       To_Resource_String ("highlightThickness");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Layout_Direction        : constant Xt_N_Resource_String :=
       To_Resource_String ("layoutDirection");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Navigation_Type         : constant Xt_N_Resource_String :=
       To_Resource_String ("navigationType");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String :=
       To_Resource_String ("popupHandlerCallback");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String :=
       To_Resource_String ("shadowThickness");
+-- UseOpenMotif2.2
+   Xm_N_Tool_Tip_String     : constant Xt_N_Resource_String :=
+      To_Resource_String ("toolTipString");
+-- EndOpenMotif2.2
    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String :=
       To_Resource_String ("topShadowColor");
    Xm_N_Top_Shadow_Pixmap       : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-print.adb ./lib/xm_widgets-print.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-print.adb Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-print.adb  Thu Dec 26 13:36:40 2002
@@ -47,7 +47,7 @@
 
 package body Xm_Widgets.Print is
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
 
    function To_Callback_Struct (Pointer : in Xt_Pointer)
       return Xm_Print_Shell_Callback_Struct_Access is
@@ -140,6 +140,6 @@
       end if;
    end Xm_Print_To_File;
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 end Xm_Widgets.Print;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-print.ads ./lib/xm_widgets-print.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-print.ads Sat Mar  2 12:17:15 2002
+++ ./lib/xm_widgets-print.ads  Thu Dec 26 13:36:40 2002
@@ -46,7 +46,7 @@
 
 package Xm_Widgets.Print is
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
 
    --  Xm_Print_Shell is a subclass of Xt_Application_Shell
    --
@@ -167,6 +167,6 @@
 
    pragma Import (C, Xm_Redisplay_Widget, "XmRedisplayWidget");
 
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 end Xm_Widgets.Print;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-screen.adb ./lib/xm_widgets-screen.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-screen.adb    Sat Mar  2 12:17:16 2002
+++ ./lib/xm_widgets-screen.adb Thu Dec 26 13:36:40 2002
@@ -44,7 +44,7 @@
      Interfaces.C;
 package body Xm_Widgets.Screen is
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Bitmap_Conversion_Model_Type, Interfaces.C.unsigned_char);
 
@@ -68,7 +68,7 @@
                   Value => Value'Address);
    end Append_Get;
    pragma Inline (Append_Get);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function To_Integer is
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-screen.ads ./lib/xm_widgets-screen.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-screen.ads    Sat Mar  2 12:17:16 2002
+++ ./lib/xm_widgets-screen.ads Thu Dec 26 13:36:40 2002
@@ -51,7 +51,7 @@
    --
    -- resources
    --
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Bitmap_Conversion_Model       : constant Xt_N_Resource_String;
 
    type Bitmap_Conversion_Model_Type is (Match_Depth, Dynamic_Depth);
@@ -67,7 +67,7 @@
  
    Xm_N_Color_Allocation_Proc         : constant Xt_N_Resource_String;
    Xm_N_Color_Calculation_Proc        : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Dark_Threshold                : constant Xt_N_Resource_String;
    Xm_N_Default_Copy_Cursor_Icon      : constant Xt_N_Resource_String;
    Xm_N_Default_Invalid_Cursor_Icon   : constant Xt_N_Resource_String;
@@ -79,9 +79,9 @@
    Xm_N_Font                          : constant Xt_N_Resource_String;
    Xm_N_Foreground_Threshold          : constant Xt_N_Resource_String;
    Xm_N_Horizontal_Font_Unit          : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Insensitive_Stipple_Bitmap    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Light_Threshold               : constant Xt_N_Resource_String;
    Xm_N_Menu_Cursor                   : constant Xt_N_Resource_String;
    Xm_N_Move_Opaque                   : constant Xt_N_Resource_String;
@@ -98,32 +98,32 @@
                          Value :    out Unpost_Behavior_Type);
    pragma Convention (C, Append_Get);
  
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Use_Color_Object              : constant Xt_N_Resource_String;
    Xm_N_User_Data                     : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Vertical_Font_Unit            : constant Xt_N_Resource_String;
 
 private
 
    pragma Import (C, Xm_Get_Xm_Screen, "XmGetXmScreen");
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Bitmap_Conversion_Model_Type use (Match_Depth => 0, Dynamic_Depth => 1);
    for Bitmap_Conversion_Model_Type'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    for Unpost_Behavior_Type use (Unpost => 0, Unpost_And_Replay => 1);
    for Unpost_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Bitmap_Conversion_Model       : constant Xt_N_Resource_String :=
       To_Resource_String ("bitmapConversionModel");
    Xm_N_Color_Allocation_Proc         : constant Xt_N_Resource_String :=
       To_Resource_String ("colorAllocationProc");
    Xm_N_Color_Calculation_Proc        : constant Xt_N_Resource_String :=
       To_Resource_String ("colorCalculationProc");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Dark_Threshold                : constant Xt_N_Resource_String :=
       To_Resource_String ("darkThreshold");
    Xm_N_Default_Copy_Cursor_Icon      : constant Xt_N_Resource_String :=
@@ -146,10 +146,10 @@
       To_Resource_String ("foregroundThreshold");
    Xm_N_Horizontal_Font_Unit          : constant Xt_N_Resource_String :=
       To_Resource_String ("horizontalFontUnit");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Insensitive_Stipple_Bitmap    : constant Xt_N_Resource_String :=
       To_Resource_String ("insensitiveStippleBitmap");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Light_Threshold               : constant Xt_N_Resource_String :=
       To_Resource_String ("lightThreshold");
    Xm_N_Menu_Cursor                   : constant Xt_N_Resource_String :=
@@ -158,12 +158,12 @@
       To_Resource_String ("moveOpaque");
    Xm_N_Unpost_Behavior               : constant Xt_N_Resource_String :=
       To_Resource_String ("unpostBehavior");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Use_Color_Object              : constant Xt_N_Resource_String :=
       To_Resource_String ("useColorObject");
    Xm_N_User_Data                     : constant Xt_N_Resource_String
       := Xm_Widgets.Xm_N_User_Data;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Vertical_Font_Unit            : constant Xt_N_Resource_String :=
       To_Resource_String ("verticalFontUnit");
 
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-shell.adb ./lib/xm_widgets-shell.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets-shell.adb Sat Mar  2 12:17:16 2002
+++ ./lib/xm_widgets-shell.adb  Thu Dec 26 13:36:41 2002
@@ -68,13 +68,13 @@
    pragma Inline (Xm_Is_Menu_Shell);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function Xm_Is_Grab_Shell (W : in Widget) return Boolean is
    begin
       return Xt_Is_Subclass (W, Xm_Grab_Shell_Widget_Class);
    end Xm_Is_Grab_Shell;
    pragma Inline (Xm_Is_Grab_Shell);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    function Xm_Is_Vendor_Shell (W : in Widget) return Boolean is
@@ -121,7 +121,7 @@
    pragma Inline (Xm_Create_Dialog_Shell);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
   -- -------------------------------------------------------------------------
   --
   --  create Grab Shell
@@ -147,7 +147,7 @@
                                Cardinal (Length (Arglist)));
   end Xm_Create_Grab_Shell;
   pragma Inline (Xm_Create_Grab_Shell);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -278,7 +278,7 @@
    pragma Inline (Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function To_Integer is
       new Ada.Unchecked_Conversion (Input_Policy, Interfaces.C.unsigned_char);
 
@@ -304,7 +304,7 @@
    pragma Inline (Append_Get);
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 end Xm_Widgets.Shell;
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-shell.ads ./lib/xm_widgets-shell.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets-shell.ads Sat Mar  2 12:17:16 2002
+++ ./lib/xm_widgets-shell.ads  Thu Dec 26 13:36:41 2002
@@ -39,6 +39,8 @@
 --          June 20, 1998 begin of history
 --          July 07, 1998 HFVogt: changed type names to Initial_Window_State,
 --                                Audible_Warning_Kind
+--          2002-03-22 Vadim Godunko: added resources Xm_N_Tool_Tip_Post_Delay,
+--                        Xm_N_Tool_Tip_Post_Duration, Xm_N_Tool_Tip_Enable
 --
 -------------------------------------------------------------------------------
 
@@ -54,9 +56,9 @@
 
    Xm_Dialog_Shell_Widget_Class        : constant Widget_Class;
    Xm_Drag_Over_Shell_Widget_Class     : constant Widget_Class;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_Grab_Shell_Widget_Class          : constant Widget_Class;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_Menu_Shell_Widget_Class          : constant Widget_Class;
    Xm_Vendor_Shell_Widget_Class        : constant Widget_Class;
 
@@ -71,13 +73,13 @@
       Arglist  : in  Arg_List := Null_Arg_List)
       return Widget;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function Xm_Create_Grab_Shell
      (Parent   : in  Widget; 
       Name     : in  String;
       Arglist  : in  Arg_List := Null_Arg_List)
       return Widget;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    function Xm_Create_Menu_Shell
      (Parent   : in  Widget; 
@@ -89,9 +91,9 @@
    function Xm_Is_Dialog_Shell    (W : in Widget) return Boolean;
    function Xm_Is_Drag_Over_Shell (W : in Widget) return Boolean;
    function Xm_Is_Menu_Shell      (W : in Widget) return Boolean;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    function Xm_Is_Grab_Shell      (W : in Widget) return Boolean;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    function Xm_Is_Vendor_Shell    (W : in Widget) return Boolean;
 
    function Xm_Is_Motif_WM_Running (Shell : in Widget) return Boolean;
@@ -121,15 +123,15 @@
    --  Menu Shell
    --
    Xm_N_Button_Font_List       : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Default_Font_List      : constant Xt_N_Resource_String;
    Xm_N_Label_Font_List        : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String;
    Xm_N_Layout_Direction       : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -216,7 +218,7 @@
    pragma Convention (C, Append_Get);
 
    Xm_N_Input_Method           : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Input_Policy           : constant Xt_N_Resource_String;
 
    type Input_Policy is (Per_Shell, Per_Widget, Inherit_Policy);
@@ -230,7 +232,7 @@
                          Value : out    Input_Policy);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    Xm_N_Keyboard_Focus_Policy  : constant Xt_N_Resource_String;
 
@@ -256,9 +258,14 @@
    Xm_N_Shell_Unit_Type        : constant Xt_N_Resource_String;
    Xm_N_Text_Font_List         : constant Xt_N_Resource_String;
    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String;
--- UseMotif2.0 Motif2.1
+-- UseOpenMotif2.2
+   Xm_N_Tool_Tip_Post_Delay    : constant Xt_N_Resource_String;
+   Xm_N_Tool_Tip_Post_Duration : constant Xt_N_Resource_String;
+   Xm_N_Tool_Tip_Enable        : constant Xt_N_Resource_String;
+-- EndOpenMotif2.2
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Unit_Type              : constant Xt_N_Resource_String;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Use_Async_Geometry     : constant Xt_N_Resource_String;
 
 
@@ -299,26 +306,26 @@
    for Keyboard_Focus_Policy use (Explicit => 0, Pointer => 1);
    for Keyboard_Focus_Policy'Size use Interfaces.C.unsigned_char'Size;
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Input_Policy use (Per_Shell => 0, Per_Widget => 1, Inherit_Policy => 255);
    for Input_Policy'Size use Interfaces.C.unsigned_char'Size;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    -- a workaround for gnat apparently not (yet) being able to import
    -- constants
    c_const_Xm_Dialog_Shell_Widget_Class        : Widget_Class;
    c_const_Xm_Drag_Over_Shell_Widget_Class     : Widget_Class;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    c_const_Xm_Grab_Shell_Widget_Class          : Widget_Class;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    c_const_Xm_Menu_Shell_Widget_Class          : Widget_Class;
    c_const_Xm_Vendor_Shell_Widget_Class        : Widget_Class;
 
    pragma Import (C, c_const_Xm_Dialog_Shell_Widget_Class, "xmDialogShellWidgetClass");
    pragma Import (C, c_const_Xm_Drag_Over_Shell_Widget_Class, "xmDragOverShellWidgetClass");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, c_const_Xm_Grab_Shell_Widget_Class, "xmGrabShellWidgetClass");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, c_const_Xm_Menu_Shell_Widget_Class, "xmMenuShellWidgetClass");
    pragma Import (C, c_const_Xm_Vendor_Shell_Widget_Class, "vendorShellWidgetClass");
 
@@ -326,10 +333,10 @@
     c_const_Xm_Dialog_Shell_Widget_Class;
    Xm_Drag_Over_Shell_Widget_Class     : constant Widget_Class :=
     c_const_Xm_Drag_Over_Shell_Widget_Class;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_Grab_Shell_Widget_Class          : constant Widget_Class :=
     c_const_Xm_Grab_Shell_Widget_Class;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_Menu_Shell_Widget_Class          : constant Widget_Class :=
     c_const_Xm_Menu_Shell_Widget_Class;
    Xm_Vendor_Shell_Widget_Class        : constant Widget_Class :=
@@ -371,20 +378,20 @@
    --
    Xm_N_Button_Font_List       : constant Xt_N_Resource_String
                                := To_Resource_String ("buttonFontList");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String
                                := To_Resource_String ("buttonRenderTable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Default_Font_List      : constant Xt_N_Resource_String
                                := To_Resource_String ("defaultFontList");
    Xm_N_Label_Font_List        : constant Xt_N_Resource_String
                                := To_Resource_String ("labelFontList");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String
                                := To_Resource_String ("labelRenderTable");
    Xm_N_Layout_Direction       : constant Xt_N_Resource_String
                                := To_Resource_String ("layoutDirection");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -464,11 +471,11 @@
 
    Xm_N_Input_Method           : constant Xt_N_Resource_String
                                := To_Resource_String ("inputMethod");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Input_Policy           : constant Xt_N_Resource_String
                                := To_Resource_String ("inputPolicy");
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    -- Xm_N_Label_Font_List        : constant Xt_N_Resource_String := To_Resource_String ("labelFontList");
    -- Xm_N_Label_Render_Table     : constant Xt_N_Resource_String := To_Resource_String ("labelRenderTable");
@@ -489,10 +496,18 @@
                                := To_Resource_String ("textFontList");
    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String
                                := To_Resource_String ("textRenderTable");
--- UseMotif2.0 Motif2.1
+-- UseOpenMotif2.2
+   Xm_N_Tool_Tip_Post_Delay    : constant Xt_N_Resource_String :=
+      To_Resource_String ("toolTipPostDelay");
+   Xm_N_Tool_Tip_Post_Duration : constant Xt_N_Resource_String :=
+      To_Resource_String ("toolTipPostDuration");
+   Xm_N_Tool_Tip_Enable        : constant Xt_N_Resource_String :=
+      To_Resource_String ("toolTipEnable");
+-- EndOpenMotif2.2
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Unit_Type              : constant Xt_N_Resource_String
                                := Xm_Widgets.Xm_N_Unit_Type;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Use_Async_Geometry     : constant Xt_N_Resource_String
                                := To_Resource_String ("useAsyncGeometry");
 
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets.adb ./lib/xm_widgets.adb
--- ../adabindx-0.7.2.orig/lib/xm_widgets.adb   Sat Mar  2 12:22:57 2002
+++ ./lib/xm_widgets.adb    Thu Dec 26 13:36:41 2002
@@ -230,7 +230,7 @@
    end Xm_Get_Pixmap_By_Depth;
 
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    function Xm_Get_Scaled_Pixmap
      (Wid           : in Widget;
       Image_Name    : in String;
@@ -256,7 +256,7 @@
                                 Foreground, Background, Depth,
                Interfaces.C.double (Scaling_Ratio));
    end Xm_Get_Scaled_Pixmap;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
    procedure Xm_Destroy_Pixmap
      (Screen      : in X_Lib.Screen_Pointer;
@@ -277,7 +277,7 @@
       new Ada.Unchecked_Conversion (Unit_Type, Interfaces.C.unsigned_char);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 -- ----------------------------------------------------------------------------
 --
 --                                 T A B
@@ -785,7 +785,7 @@
       end loop;
    end Xm_Parse_Table_Free;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    -- -------------------------------------------------------------------------
    --
@@ -801,7 +801,7 @@
    pragma Inline (Xm_Font_List_Free);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 -- ----------------------------------------------------------------------------
 --
 --                            X M _ S T R I N G
@@ -824,8 +824,8 @@
 
    function Xm_String_Generate
      (Text           : in String;
-      Font_Or_Locale : in Xm_String_Tag;
-      Rendition_Tag  : in Xm_String_Tag)
+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
       return Xm_String is
 
       Text_String   : constant Interfaces.C.Char_Array
@@ -841,8 +841,8 @@
 
    function Xm_String_Generate
      (Text           : in Wide_String;
-      Font_Or_Locale : in Xm_String_Tag;
-      Rendition_Tag  : in Xm_String_Tag)
+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
       return Xm_String is
       W_String   : constant Interfaces.C.Wchar_Array
                  := Interfaces.C.To_C (Text, Append_Nul => True);
@@ -941,7 +941,7 @@
       Wide_S : Interfaces.C.Wstrings.wchars_ptr;
    begin
       Wide_S := XmStringUnparse (Str, Tag, Tag_Type,
-                            Multibyte_Text,
+                                 Widechar_Text,
                     Parse_Table'Address,
                     X_Toolkit.Cardinal (Parse_Table'Length),
                     Parse_Model);
@@ -954,7 +954,7 @@
    end Xm_String_Unparse;
 
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 -- ----------------------------------------------------------------------------
 --
@@ -1236,7 +1236,7 @@
    end Xm_String_Empty;
       
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    -- -------------------------------------------------------------------------
    --
    --  Xm_String_Is_Void
@@ -1247,7 +1247,7 @@
    begin
       return XmStringIsVoid (Str) = Xt_Boolean'(True);
    end Xm_String_Is_Void;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -1304,11 +1304,11 @@
    procedure Xm_String_Draw
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1320,11 +1320,11 @@
       procedure XmStringDraw
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1335,24 +1335,24 @@
          Clip         : in System.Address);
       pragma Import (C, XmStringDraw, "XmStringDraw");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDraw (Display, W, Render_Table, Str, GC, X, Y, Width,
                     Align, Lay_Dir, Clip'Address);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDraw (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                     Align, Lay_Dir, Clip'Address);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw;
 
 
    procedure Xm_String_Draw
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1363,11 +1363,11 @@
       procedure XmStringDraw
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1378,13 +1378,13 @@
          Clip         : in System.Address);
       pragma Import (C, XmStringDraw, "XmStringDraw");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDraw (Display, W, Render_Table, Str, GC, X, Y, Width,
                     Align, Lay_Dir, System.Null_Address);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDraw (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                     Align, Lay_Dir, System.Null_Address);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw;
 
 
@@ -1392,11 +1392,11 @@
    procedure Xm_String_Draw_Image
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1408,11 +1408,11 @@
       procedure XmStringDrawImage
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1423,24 +1423,24 @@
          Clip         : in System.Address);
       pragma Import (C, XmStringDrawImage, "XmStringDrawImage");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDrawImage (Display, W, Render_Table, Str, GC, X, Y, Width,
                          Align, Lay_Dir, Clip'Address);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDrawImage (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                          Align, Lay_Dir, Clip'Address);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw_Image;
 
 
    procedure Xm_String_Draw_Image
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1451,11 +1451,11 @@
       procedure XmStringDrawImage
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1466,13 +1466,13 @@
          Clip         : in System.Address);
       pragma Import (C, XmStringDrawImage, "XmStringDrawImage");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDrawImage (Display, W, Render_Table, Str, GC, X, Y, Width,
                          Align, Lay_Dir, System.Null_Address);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDrawImage (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                          Align, Lay_Dir, System.Null_Address);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw_Image;
 
 
@@ -1480,11 +1480,11 @@
    procedure Xm_String_Draw_Underline
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1497,11 +1497,11 @@
       procedure XmStringDrawUnderline
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1513,24 +1513,24 @@
          Underline    : in Xm_String);
       pragma Import (C, XmStringDrawUnderline, "XmStringDrawUnderline");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDrawUnderline (Display, W, Render_Table, Str, GC, X, Y, Width,
                              Align, Lay_Dir, Clip'Address, Underline);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDrawUnderline (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                              Align, Lay_Dir, Clip'Address, Underline);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw_Underline;
 
 
    procedure Xm_String_Draw_Underline
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1542,11 +1542,11 @@
       procedure XmStringDrawUnderline
         (Display      : in X_Lib.Display_Pointer;
          W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
          Str          : in Xm_String;
          GC           : in X_Lib.GC_Pointer;
          X,
@@ -1558,13 +1558,13 @@
          Underline    : in Xm_String);
       pragma Import (C, XmStringDrawUnderline, "XmStringDrawUnderline");
    begin
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       XmStringDrawUnderline (Display, W, Render_Table, Str, GC, X, Y, Width,
                              Align, Lay_Dir, System.Null_Address, Underline);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       XmStringDrawUnderline (Display, W, Fontlist, Str, GC, X, Y, Width,
 --!                              Align, Lay_Dir, System.Null_Address, Underline);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    end Xm_String_Draw_Underline;
 
 
@@ -1705,7 +1705,7 @@
    function To_Integer is
       new Ada.Unchecked_Conversion (Orientation_Type, Interfaces.C.unsigned_char);
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 
    --  if unsuccessful, raise Xm_Error_Conversion_Failed
    -- 
@@ -1747,7 +1747,7 @@
       end if;
    end Xm_Convert_String_To_Units;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 --
@@ -1855,7 +1855,7 @@
    end Append_Get;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
                          Value : in     Xm_Render_Table) is
@@ -1876,7 +1876,7 @@
                   Value => Value'Address);
    end Append_Get;
    pragma Inline (Append_Get);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
  
    function To_Int is
diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets.ads ./lib/xm_widgets.ads
--- ../adabindx-0.7.2.orig/lib/xm_widgets.ads   Sat Mar  2 12:20:31 2002
+++ ./lib/xm_widgets.ads    Thu Dec 26 13:36:41 2002
@@ -105,7 +105,7 @@
    Component_Direction       : constant Xm_String_Component_Type := 3;
    Component_Separator       : constant Xm_String_Component_Type := 4;
    Component_Locale_Text     : constant Xm_String_Component_Type := 5;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Component_Locale          : constant Xm_String_Component_Type := 6;
    Component_Widechar_Text   : constant Xm_String_Component_Type := 7;
    Component_Layout_Push     : constant Xm_String_Component_Type := 8;
@@ -113,7 +113,7 @@
    Component_Rendition_Begin     : constant Xm_String_Component_Type := 10;
    Component_Rendition_End   : constant Xm_String_Component_Type := 11;
    Component_Tab         : constant Xm_String_Component_Type := 12;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    -- Elements 13 to 126 are reserved
    Component_End         : constant Xm_String_Component_Type := 126;
    Component_User_Begin      : constant Xm_String_Component_Type := 128;
@@ -181,6 +181,8 @@
 
    Motif_Default_Locale : constant Xm_String_Tag
       := X_Strings.To_X_String ("_MOTIF_DEFAULT_LOCALE");
+   Xm_Fontlist_Default_Tag : constant Xm_String_Tag
+      := X_Strings.To_X_String ("FONTLIST_DEFAULT_TAG_STRING");
 
 
    type Xm_String_Tag_Array is array (Natural range <>) of Xm_String_Tag;
@@ -281,23 +283,23 @@
    --
    -- Merge Mode
    --
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    type Xm_Merge_Mode is (Skip,      Merge_Replace,     Merge_Old,
                           Merge_New, Duplicate);
    for Xm_Merge_Mode use (Skip => 0,      Merge_Replace => 1, Merge_Old => 2,
                           Merge_New => 3, Duplicate => 4);
--- NotMotif2.1
+-- NotMotif2.1 OpenMotif2.2
 --!    type Xm_Merge_Mode is (Skip,      Replace,     Merge_Old,
 --!                           Merge_New, Duplicate);
 --!    for Xm_Merge_Mode use (Skip => 0,      Replace => 1,     Merge_Old => 2,
 --!                           Merge_New => 3, Duplicate => 4);
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
    for Xm_Merge_Mode'Size use Interfaces.C.unsigned_char'Size;
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    -- for compatibility with M*tif versions < 2.1
    --
    Replace : constant Xm_Merge_Mode := Merge_Replace;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 
    --
@@ -437,17 +439,17 @@
    type Xm_String_Ptr is access Xm_String; 
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Unit_Type is (Pixels,           Centi_Millimeters,
                       Milli_Inches,     Centi_Points,
                       Centi_Font_Units, Inches,
                       Centimeters,      Millimeters,
                       Points,           Font_Units);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    type Unit_Type is (Pixels,           Centi_Millimeters,
 --!                       Milli_Inches,     Centi_Points,
 --!                       Centi_Font_Units);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    type Orientation_Type is (No_Orientation, Vertical, Horizontal);
 
@@ -514,7 +516,7 @@
       Depth       : in X_Lib.Color_Depth)
       return X_Lib.Pixmap_ID;
 
--- UseMotif2.1
+-- UseMotif2.1 OpenMotif2.2
    function Xm_Get_Scaled_Pixmap
      (Wid           : in Widget;
       Image_Name    : in String;
@@ -523,7 +525,7 @@
       Depth         : in X_Lib.Color_Depth;
       Scaling_Ratio : in Long_Float)
       return X_Lib.Pixmap_ID;
--- EndMotif2.1
+-- EndMotif2.1 OpenMotif2.2
 
 
    -- remove the given pixmap from the pixmap cache
@@ -533,7 +535,7 @@
       Pixmap      : in X_Lib.Pixmap_ID);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 -- ----------------------------------------------------------------------------
 --
 --                                 T A B
@@ -808,7 +810,7 @@
 
    procedure Xm_Parse_Table_Free   (Parse_Table   : in out Xm_Parse_Table);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
 -- ----------------------------------------------------------------------------
@@ -855,7 +857,7 @@
 
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
 -- ----------------------------------------------------------------------------
 --
 --                            X M _ S T R I N G
@@ -877,14 +879,14 @@
    --
    function Xm_String_Generate
      (Text           : in String;
-      Font_Or_Locale : in Xm_String_Tag;
-      Rendition_Tag  : in Xm_String_Tag)
+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
       return Xm_String;
 
    function Xm_String_Generate
      (Text           : in Wide_String;
-      Font_Or_Locale : in Xm_String_Tag;
-      Rendition_Tag  : in Xm_String_Tag)
+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
       return Xm_String;
 
 --   function Xm_String_Generate
@@ -947,7 +949,7 @@
    --
    function Xm_String_Is_Void (Str : in Xm_String) return Boolean;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 -- ----------------------------------------------------------------------------
 --
@@ -1160,11 +1162,11 @@
    --  Xm_String_Width
    --
    function Xm_String_Width
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str      : in Xm_String)
       return X_Lib.Dimension;
 
@@ -1174,11 +1176,11 @@
    --  Xm_String_Height
    --
    function Xm_String_Height
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str      : in Xm_String)
       return X_Lib.Dimension;
 
@@ -1188,11 +1190,11 @@
    --  Xm_String_Extent
    --
    procedure Xm_String_Extent
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str       : in     Xm_String;
       Width     :    out X_Lib.Dimension;
       Height    :    out X_Lib.Dimension);
@@ -1203,11 +1205,11 @@
    --  Xm_String_Baseline
    --
    function Xm_String_Baseline
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str      : in Xm_String)
       return X_Lib.Dimension;
 
@@ -1219,11 +1221,11 @@
    procedure Xm_String_Draw
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1236,11 +1238,11 @@
    procedure Xm_String_Draw
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1257,11 +1259,11 @@
    procedure Xm_String_Draw_Image
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1274,11 +1276,11 @@
    procedure Xm_String_Draw_Image
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1295,11 +1297,11 @@
    procedure Xm_String_Draw_Underline
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1313,11 +1315,11 @@
    procedure Xm_String_Draw_Underline
      (Display      : in X_Lib.Display_Pointer;
       W            : in X_Lib.Window_ID;
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
       Str          : in Xm_String;
       GC           : in X_Lib.GC_Pointer;
       X,
@@ -1457,7 +1459,7 @@
    Xm_Error_Invalid_Callback_Reason    : exception;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_Error_Conversion_Failed          : exception;
 
    --  if unsuccessful, raise Xm_Error_Conversion_Failed
@@ -1468,7 +1470,7 @@
       Orientation : in Orientation_Type;
       To_Unit     : in Unit_Type)
       return Integer;
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
 
    -- -------------------------------------------------------------------------
@@ -1559,7 +1561,7 @@
    pragma Convention (C, Append_Get);
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
                          Value : in     Xm_Render_Table);
@@ -1569,7 +1571,7 @@
                          Value : out    Xm_Render_Table);
    pragma Convention (C, Append_Get);
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    procedure Append_Set (List  : in out Arg_List;
                          Name  : in     Xt_N_Resource_String;
@@ -1658,7 +1660,7 @@
    for Xm_Text_Scan_Type'Size use Interfaces.C.unsigned_char'Size;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    type Xm_Tab is new System.Address;
    Null_Tab : constant Xm_Tab := Xm_Tab (System.Null_Address);
 
@@ -1693,7 +1695,7 @@
                            Output_Both => 4);
    for Xm_Parse_Model'Size use Interfaces.C.unsigned_char'Size;
 
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
 
    type Xm_Font_List  is new System.Address;
    Null_Font_List : constant Xm_Font_List := Xm_Font_List (System.Null_Address);
@@ -1747,17 +1749,17 @@
       return Callback_Struct_Access;
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    for Unit_Type use (Pixels => 0,           Centi_Millimeters => 1,
                       Milli_Inches => 2,     Centi_Points => 3,
                       Centi_Font_Units => 4, Inches => 5,
                       Centimeters => 6,      Millimeters => 7,
                       Points => 8,           Font_Units => 9);
--- NotMotif2.0 Motif2.1
+-- NotMotif2.0 Motif2.1 OpenMotif2.2
 --!    for Unit_Type use (Pixels => 0,           Centi_Millimeters => 1,
 --!                       Milli_Inches => 2,     Centi_Points => 3,
 --!                       Centi_Font_Units => 4);
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    for Unit_Type'Size use Interfaces.C.unsigned_char'Size;
 
    for Orientation_Type use (No_Orientation => 0, Vertical => 1, Horizontal => 2);
@@ -1830,20 +1832,20 @@
 -- End64Bit
 
 
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, Xm_Tab_Set_Value, "XmTabSetValue");
    pragma Import (C, Xm_Tab_List_Tab_Copy, "XmTabListTabCopy");
    pragma Import (C, Xm_Tab_List_Get_Tab, "XmTabListGetTab");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, Xm_Font_List_Add, "XmFontListAdd");
    pragma Import (C, Xm_Font_List_Copy, "XmFontListCopy");
    pragma Import (C, Xm_Font_List_Create, "XmFontListCreate");
    pragma Import (C, Xm_String_Direction_Create, "XmStringDirectionCreate");
    pragma Import (C, Xm_String_Peek_Next_Component,"XmStringPeekNextComponent");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, Xm_String_Put_Rendition, "XmStringPutRendition");
    pragma Import (C, Xm_Render_Table_Get_Rendition, "XmRenderTableGetRendition");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    pragma Import (C, Xm_String_Copy, "XmStringCopy");
    pragma Import (C, Xm_String_N_Copy, "XmStringNCopy");
    pragma Import (C, Xm_String_Concat, "XmStringConcat");
@@ -1930,12 +1932,12 @@
    --
    -- resource strings of subpackages of xm_widgets
    --
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
       To_Resource_String ("destinationCallback");
    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String :=
       To_Resource_String ("detailShadowThickness");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Font_List               : constant Xt_N_Resource_String :=
       To_Resource_String ("fontList");
    Xm_N_Label_String            : constant Xt_N_Resource_String :=
@@ -1946,12 +1948,12 @@
       To_Resource_String ("marginWidth");
    Xm_N_Modify_Verify_Callback  : constant Xt_N_Resource_String :=
       To_Resource_String ("modifyVerifyCallback");
--- UseMotif2.0 Motif2.1
+-- UseMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String :=
       To_Resource_String ("primaryOwnership");
    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
       To_Resource_String ("renderTable");
--- EndMotif2.0 Motif2.1
+-- EndMotif2.0 Motif2.1 OpenMotif2.2
    Xm_N_Select_Color            : constant Xt_N_Resource_String :=
       To_Resource_String ("selectColor");
    Xm_N_Selection_Policy        : constant Xt_N_Resource_String :=
diff -Naur ../adabindx-0.7.2.orig/utils/Makefile ./utils/Makefile
--- ../adabindx-0.7.2.orig/utils/Makefile   Mon Apr 27 00:40:57 1998
+++ ./utils/Makefile    Thu Dec 26 13:36:41 2002
@@ -28,6 +28,10 @@
 islittleend: islittleend.adb
    $(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../lib $@ -largs $(ADA_LINK_FLAGS)
 
+install:
+   cp makefallb $(PREFIX)/bin
+   cp xpm2axpm $(PREFIX)/bin
+
 clean:
    $(RM) *.ali *.o