Find/Replace marshalling back to Adapad Main done, some Group/Widget_Cursor stuff removed

4 files changed, 6 insertions, 13 deletions

diff --git a/fltk-widgets-groups.adb b/fltk-widgets-groups.adb
index 3ffd1e3..2197d28 100644
--- a/fltk-widgets-groups.adb
+++ b/fltk-widgets-groups.adb
@@ -109,7 +109,7 @@ package body FLTK.Widgets.Groups is
     function Child
            (This  : in Group;
             Place : in Index)
-        return Widget_Cursor is
+        return access Widget'Class is
 
         Widget_Ptr : System.Address :=
                 fl_group_child (This.Void_Ptr, Interfaces.C.int (Place - 1));
@@ -118,7 +118,7 @@ package body FLTK.Widgets.Groups is
                 Widget_Convert.To_Pointer (fl_widget_get_user_data (Widget_Ptr));
 
     begin
-        return Ref : Widget_Cursor (Data => Actual_Widget);
+        return Actual_Widget;
     end Child;
 
 
diff --git a/fltk-widgets-groups.ads b/fltk-widgets-groups.ads
index e777f04..57faf87 100644
--- a/fltk-widgets-groups.ads
+++ b/fltk-widgets-groups.ads
@@ -24,7 +24,7 @@ package FLTK.Widgets.Groups is
     function Child
            (This  : in Group;
             Place : in Index)
-        return Widget_Cursor;
+        return access Widget'Class;
 
 
     function Number_Of_Children
diff --git a/fltk-widgets.adb b/fltk-widgets.adb
index 5ec090d..0a159c7 100644
--- a/fltk-widgets.adb
+++ b/fltk-widgets.adb
@@ -110,7 +110,7 @@ package body FLTK.Widgets is
 
     function Parent
            (This : in Widget)
-        return Group_Cursor is
+        return access FLTK.Widgets.Groups.Group'Class is
 
         Parent_Ptr : System.Address;
         Actual_Parent : access Group'Class;
@@ -120,7 +120,7 @@ package body FLTK.Widgets is
         if Parent_Ptr /= System.Null_Address then
             Actual_Parent := Group_Convert.To_Pointer (fl_widget_get_user_data (Parent_Ptr));
         end if;
-        return Ref : Group_Cursor (Data => Actual_Parent);
+        return Actual_Parent;
     end Parent;
 
 
diff --git a/fltk-widgets.ads b/fltk-widgets.ads
index c0f89c1..05bba29 100644
--- a/fltk-widgets.ads
+++ b/fltk-widgets.ads
@@ -10,8 +10,6 @@ package FLTK.Widgets is
 
 
     type Widget is abstract new Wrapper with private;
-    type Widget_Cursor (Data : access Widget'Class) is limited null record
-        with Implicit_Dereference => Data;
 
 
     type Widget_Callback is interface;
@@ -20,11 +18,6 @@ package FLTK.Widgets is
             Item : in out Widget'Class) is abstract;
 
 
-    --  would like to move this definition to FLTK.Widgets.Groups somehow
-    type Group_Cursor (Data : access FLTK.Widgets.Groups.Group'Class) is limited null record
-        with Implicit_Dereference => Data;
-
-
     type Font_Size is new Natural;
     Normal_Size : constant Font_Size := 14;
     type Color is new Natural;
@@ -38,7 +31,7 @@ package FLTK.Widgets is
 
     function Parent
            (This : in Widget)
-        return Group_Cursor;
+        return access FLTK.Widgets.Groups.Group'Class;
 
 
     function Get_Box