Removed superfluous extra_final stuffHEADmaster

23 files changed, 6 insertions, 214 deletions

diff --git a/body/c_fl_button.cpp b/body/c_fl_button.cpp
index df87ecc..ba08bc9 100644
--- a/body/c_fl_button.cpp
+++ b/body/c_fl_button.cpp
@@ -11,18 +11,13 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void button_extra_init_hook(void * aobj, int x, int y, int w, int h, const char * l);
 void fl_button_extra_init(void * adaobj, int x, int y, int w, int h, const char * label) {
     button_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void button_extra_final_hook(void * aobj);
-void fl_button_extra_final(void * adaobj) {
-    button_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_button.h b/body/c_fl_button.h
index f644a50..dfc0631 100644
--- a/body/c_fl_button.h
+++ b/body/c_fl_button.h
@@ -9,7 +9,6 @@
 
 
 extern "C" void fl_button_extra_init(void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_button_extra_final(void * adaobj);
 
 
 typedef void* BUTTON;
diff --git a/body/c_fl_check_button.cpp b/body/c_fl_check_button.cpp
index b12bf68..f590aa0 100644
--- a/body/c_fl_check_button.cpp
+++ b/body/c_fl_check_button.cpp
@@ -11,7 +11,7 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void check_button_extra_init_hook
     (void * aobj, int x, int y, int w, int h, const char * l);
@@ -19,11 +19,6 @@ void fl_check_button_extra_init (void * adaobj, int x, int y, int w, int h, cons
     check_button_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void check_button_extra_final_hook(void * aobj);
-void fl_check_button_extra_final(void * adaobj) {
-    check_button_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_check_button.h b/body/c_fl_check_button.h
index cfa6bff..88f1a00 100644
--- a/body/c_fl_check_button.h
+++ b/body/c_fl_check_button.h
@@ -10,7 +10,6 @@
 
 extern "C" void fl_check_button_extra_init
     (void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_check_button_extra_final(void * adaobj);
 
 
 typedef void* CHECKBUTTON;
diff --git a/body/c_fl_input.cpp b/body/c_fl_input.cpp
index 799c76e..73517a7 100644
--- a/body/c_fl_input.cpp
+++ b/body/c_fl_input.cpp
@@ -11,18 +11,13 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void text_input_extra_init_hook(void * aobj, int x, int y, int w, int h, const char * l);
 void fl_text_input_extra_init(void * adaobj, int x, int y, int w, int h, const char * label) {
     text_input_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void text_input_extra_final_hook(void * aobj);
-void fl_text_input_extra_final(void * adaobj) {
-    text_input_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_input.h b/body/c_fl_input.h
index 06a8a0c..dec6265 100644
--- a/body/c_fl_input.h
+++ b/body/c_fl_input.h
@@ -10,7 +10,6 @@
 
 extern "C" void fl_text_input_extra_init
     (void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_text_input_extra_final(void * adaobj);
 
 
 typedef void* TEXTINPUT;
diff --git a/body/c_fl_menu_button.cpp b/body/c_fl_menu_button.cpp
index 8c04884..4537e8d 100644
--- a/body/c_fl_menu_button.cpp
+++ b/body/c_fl_menu_button.cpp
@@ -11,7 +11,7 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void menu_button_extra_init_hook
     (void * aobj, int x, int y, int w, int h, const char * l);
@@ -19,11 +19,6 @@ void fl_menu_button_extra_init(void * adaobj, int x, int y, int w, int h, const
     menu_button_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void menu_button_extra_final_hook(void * aobj);
-void fl_menu_button_extra_final(void * adaobj) {
-    menu_button_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_menu_button.h b/body/c_fl_menu_button.h
index d567e4f..f8f721b 100644
--- a/body/c_fl_menu_button.h
+++ b/body/c_fl_menu_button.h
@@ -10,7 +10,6 @@
 
 extern "C" void fl_menu_button_extra_init
     (void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_menu_button_extra_final(void * adaobj);
 
 
 typedef void* MENUBUTTON;
diff --git a/body/c_fl_scroll.cpp b/body/c_fl_scroll.cpp
index 3aa4364..325d8cf 100644
--- a/body/c_fl_scroll.cpp
+++ b/body/c_fl_scroll.cpp
@@ -11,18 +11,13 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void scroll_extra_init_hook(void * aobj, int x, int y, int w, int h, const char * l);
 void fl_scroll_extra_init(void * adaobj, int x, int y, int w, int h, const char * label) {
     scroll_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void scroll_extra_final_hook(void * aobj);
-void fl_scroll_extra_final(void * adaobj) {
-    scroll_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_scroll.h b/body/c_fl_scroll.h
index 17dec0f..e39e469 100644
--- a/body/c_fl_scroll.h
+++ b/body/c_fl_scroll.h
@@ -9,7 +9,6 @@
 
 
 extern "C" void fl_scroll_extra_init(void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_scroll_extra_final(void * adaobj);
 
 
 typedef void* SCROLL;
diff --git a/body/c_fl_scrollbar.cpp b/body/c_fl_scrollbar.cpp
index b71148a..bf5ceaa 100644
--- a/body/c_fl_scrollbar.cpp
+++ b/body/c_fl_scrollbar.cpp
@@ -11,18 +11,13 @@
 
 
 
-//  Telprot stopovers
+//  Telprot stopover
 
 extern "C" void scrollbar_extra_init_hook(void * aobj, int x, int y, int w, int h, const char * l);
 void fl_scrollbar_extra_init (void * adaobj, int x, int y, int w, int h, const char * label) {
     scrollbar_extra_init_hook(adaobj, x, y, w, h, label);
 }
 
-extern "C" void scrollbar_extra_final_hook(void * aobj);
-void fl_scrollbar_extra_final(void * adaobj) {
-    scrollbar_extra_final_hook(adaobj);
-}
-
 
 
 
diff --git a/body/c_fl_scrollbar.h b/body/c_fl_scrollbar.h
index 870f256..6dd599d 100644
--- a/body/c_fl_scrollbar.h
+++ b/body/c_fl_scrollbar.h
@@ -10,7 +10,6 @@
 
 extern "C" void fl_scrollbar_extra_init
     (void * adaobj, int x, int y, int w, int h, const char * label);
-extern "C" void fl_scrollbar_extra_final(void * adaobj);
 
 
 typedef void* SCROLLBAR;
diff --git a/body/fltk-file_choosers.adb b/body/fltk-file_choosers.adb
index a5eac34..ef33753 100644
--- a/body/fltk-file_choosers.adb
+++ b/body/fltk-file_choosers.adb
@@ -535,28 +535,11 @@ package body FLTK.File_Choosers is
     --  Destructors  --
     -------------------
 
-    --  Releasing carrier pigeon
-    procedure fl_button_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_button_extra_final, "fl_button_extra_final");
-    pragma Inline (fl_button_extra_final);
-
-
-    --  Entering wormhole
-    procedure fl_check_button_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_check_button_extra_final, "fl_check_button_extra_final");
-    pragma Inline (fl_check_button_extra_final);
-
-
     procedure Extra_Final
            (This : in out File_Chooser)
     is
         use Interfaces.C.Strings;
     begin
-        fl_button_extra_final (Storage.To_Integer (This.New_Butt'Address));
-        fl_check_button_extra_final (Storage.To_Integer (This.Preview_Butt'Address));
-        fl_check_button_extra_final (Storage.To_Integer (This.Hidden_Butt'Address));
         Free (This.My_Label);
         Free (This.My_OK_Label);
     end Extra_Final;
diff --git a/body/fltk-widgets-buttons-light-check.adb b/body/fltk-widgets-buttons-light-check.adb
index b75ef64..c3f1971 100644
--- a/body/fltk-widgets-buttons-light-check.adb
+++ b/body/fltk-widgets-buttons-light-check.adb
@@ -55,22 +55,6 @@ package body FLTK.Widgets.Buttons.Light.Check is
     --  Destructors  --
     -------------------
 
-    --  Round the world and home again, that's the sailor's way!
-    procedure check_button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, check_button_extra_final_hook, "check_button_extra_final_hook");
-
-    procedure check_button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Check_Button : Check_Button;
-        for My_Check_Button'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Check_Button);
-    begin
-        Extra_Final (My_Check_Button);
-    end check_button_extra_final_hook;
-
-
     procedure Extra_Final
            (This : in out Check_Button) is
     begin
diff --git a/body/fltk-widgets-buttons.adb b/body/fltk-widgets-buttons.adb
index bc78d8d..2d1e169 100644
--- a/body/fltk-widgets-buttons.adb
+++ b/body/fltk-widgets-buttons.adb
@@ -116,22 +116,6 @@ package body FLTK.Widgets.Buttons is
     --  Destructors  --
     -------------------
 
-    --  Clipper route successfully navigated
-    procedure button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, button_extra_final_hook, "button_extra_final_hook");
-
-    procedure button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Button : Button;
-        for My_Button'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Button);
-    begin
-        Extra_Final (My_Button);
-    end button_extra_final_hook;
-
-
     procedure Extra_Final
            (This : in out Button) is
     begin
diff --git a/body/fltk-widgets-groups-browsers.adb b/body/fltk-widgets-groups-browsers.adb
index e65dedc..13cdba7 100644
--- a/body/fltk-widgets-groups-browsers.adb
+++ b/body/fltk-widgets-groups-browsers.adb
@@ -650,18 +650,9 @@ package body FLTK.Widgets.Groups.Browsers is
     --  Destructors  --
     -------------------
 
-    --  Preparing to use morse code
-    procedure fl_scrollbar_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_scrollbar_extra_final, "fl_scrollbar_extra_final");
-    pragma Inline (fl_scrollbar_extra_final);
-
-
     procedure Extra_Final
            (This : in out Browser) is
     begin
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Horizon'Address));
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Vertigo'Address));
         Extra_Final (Group (This));
         for Index in This.Text_Store'Range loop
             Interfaces.C.Strings.Free (This.Text_Store (Index));
diff --git a/body/fltk-widgets-groups-input_choices.adb b/body/fltk-widgets-groups-input_choices.adb
index edd16db..9119768 100644
--- a/body/fltk-widgets-groups-input_choices.adb
+++ b/body/fltk-widgets-groups-input_choices.adb
@@ -184,25 +184,9 @@ package body FLTK.Widgets.Groups.Input_Choices is
     --  Destructors  --
     -------------------
 
-    --  Resorting to smoke signals
-    procedure fl_text_input_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_text_input_extra_final, "fl_text_input_extra_final");
-    pragma Inline (fl_text_input_extra_final);
-
-
-    --  Message in a bottle
-    procedure fl_menu_button_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_menu_button_extra_final, "fl_menu_button_extra_final");
-    pragma Inline (fl_menu_button_extra_final);
-
-
     procedure Extra_Final
            (This : in out Input_Choice) is
     begin
-        fl_text_input_extra_final (Storage.To_Integer (This.My_Input'Address));
-        fl_menu_button_extra_final (Storage.To_Integer (This.My_Menu_Button'Address));
         Extra_Final (Group (This));
     end Extra_Final;
 
diff --git a/body/fltk-widgets-groups-scrolls.adb b/body/fltk-widgets-groups-scrolls.adb
index e280058..65498a6 100644
--- a/body/fltk-widgets-groups-scrolls.adb
+++ b/body/fltk-widgets-groups-scrolls.adb
@@ -153,34 +153,9 @@ package body FLTK.Widgets.Groups.Scrolls is
     --  Destructors  --
     -------------------
 
-    --  I used the FFI to bypass namespace rules and all I got was this lousy tshirt
-    procedure scroll_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, scroll_extra_final_hook, "scroll_extra_final_hook");
-
-    procedure scroll_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Scroll : Scroll;
-        for My_Scroll'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Scroll);
-    begin
-        Extra_Final (My_Scroll);
-    end scroll_extra_final_hook;
-
-
-    --  It's the only way to be sure
-    procedure fl_scrollbar_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_scrollbar_extra_final, "fl_scrollbar_extra_final");
-    pragma Inline (fl_scrollbar_extra_final);
-
-
     procedure Extra_Final
            (This : in out Scroll) is
     begin
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Horizon'Address));
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Vertigo'Address));
         Extra_Final (Group (This));
     end Extra_Final;
 
diff --git a/body/fltk-widgets-groups-tables.adb b/body/fltk-widgets-groups-tables.adb
index b572b8e..8417cd6 100644
--- a/body/fltk-widgets-groups-tables.adb
+++ b/body/fltk-widgets-groups-tables.adb
@@ -743,26 +743,9 @@ package body FLTK.Widgets.Groups.Tables is
     --  Destructors  --
     -------------------
 
-    --  Attempting to divide by zero
-    procedure fl_scrollbar_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_scrollbar_extra_final, "fl_scrollbar_extra_final");
-    pragma Inline (fl_scrollbar_extra_final);
-
-
-    --  Close the door; Open the nExt
-    procedure fl_scroll_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_scroll_extra_final, "fl_scroll_extra_final");
-    pragma Inline (fl_scroll_extra_final);
-
-
     procedure Extra_Final
            (This : in out Table) is
     begin
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Horizon'Address));
-        fl_scrollbar_extra_final (Storage.To_Integer (This.Vertigo'Address));
-        fl_scroll_extra_final (Storage.To_Integer (This.Playing_Area'Address));
         Extra_Final (Group (This));
     end Extra_Final;
 
diff --git a/body/fltk-widgets-inputs-text.adb b/body/fltk-widgets-inputs-text.adb
index 472f279..ddac5d9 100644
--- a/body/fltk-widgets-inputs-text.adb
+++ b/body/fltk-widgets-inputs-text.adb
@@ -55,22 +55,6 @@ package body FLTK.Widgets.Inputs.Text is
     --  Destructors  --
     -------------------
 
-    --  Message received, every zig will take off
-    procedure text_input_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, text_input_extra_final_hook, "text_input_extra_final_hook");
-
-    procedure text_input_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Text_Input : Text_Input;
-        for My_Text_Input'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Text_Input);
-    begin
-        Extra_Final (My_Text_Input);
-    end text_input_extra_final_hook;
-
-
     procedure Extra_Final
            (This : in out Text_Input) is
     begin
diff --git a/body/fltk-widgets-menus-menu_buttons.adb b/body/fltk-widgets-menus-menu_buttons.adb
index 949403c..c305320 100644
--- a/body/fltk-widgets-menus-menu_buttons.adb
+++ b/body/fltk-widgets-menus-menu_buttons.adb
@@ -90,22 +90,6 @@ package body FLTK.Widgets.Menus.Menu_Buttons is
     --  Destructors  --
     -------------------
 
-    --  More magic
-    procedure menu_button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, menu_button_extra_final_hook, "menu_button_extra_final_hook");
-
-    procedure menu_button_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Menu_Button : Menu_Button;
-        for My_Menu_Button'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Menu_Button);
-    begin
-        Extra_Final (My_Menu_Button);
-    end menu_button_extra_final_hook;
-
-
     procedure Extra_Final
            (This : in out Menu_Button) is
     begin
diff --git a/body/fltk-widgets-valuators-sliders-scrollbars.adb b/body/fltk-widgets-valuators-sliders-scrollbars.adb
index f08ccaf..660970a 100644
--- a/body/fltk-widgets-valuators-sliders-scrollbars.adb
+++ b/body/fltk-widgets-valuators-sliders-scrollbars.adb
@@ -90,22 +90,6 @@ package body FLTK.Widgets.Valuators.Sliders.Scrollbars is
     --  Destructors  --
     -------------------
 
-    --  End of the line
-    procedure scrollbar_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Export (C, scrollbar_extra_final_hook, "scrollbar_extra_final_hook");
-
-    procedure scrollbar_extra_final_hook
-           (Ada_Obj : in Storage.Integer_Address)
-    is
-        My_Scrollbar : Scrollbar;
-        for My_Scrollbar'Address use Storage.To_Address (Ada_Obj);
-        pragma Import (Ada, My_Scrollbar);
-    begin
-        Extra_Final (My_Scrollbar);
-    end scrollbar_extra_final_hook;
-
-
     procedure Extra_Final
            (This : in out Scrollbar) is
     begin
diff --git a/body/fltk-widgets-valuators-value_inputs.adb b/body/fltk-widgets-valuators-value_inputs.adb
index ded1096..1909c1c 100644
--- a/body/fltk-widgets-valuators-value_inputs.adb
+++ b/body/fltk-widgets-valuators-value_inputs.adb
@@ -173,17 +173,9 @@ package body FLTK.Widgets.Valuators.Value_Inputs is
     --  Destructors  --
     -------------------
 
-    --  Making a long distance telephone call
-    procedure fl_text_input_extra_final
-           (Ada_Obj : in Storage.Integer_Address);
-    pragma Import (C, fl_text_input_extra_final, "fl_text_input_extra_final");
-    pragma Inline (fl_text_input_extra_final);
-
-
     procedure Extra_Final
            (This : in out Value_Input) is
     begin
-        fl_text_input_extra_final (Storage.To_Integer (This.My_Input'Address));
         Extra_Final (Valuator (This));
     end Extra_Final;