diff options
| author | Jed Barber <jjbarber@y7mail.com> | 2018-03-13 17:38:01 +1100 |
|---|---|---|
| committer | Jed Barber <jjbarber@y7mail.com> | 2018-03-13 17:38:01 +1100 |
| commit | 3f59b75f1bb14d0daa7d979617fd7318aaf89c7c (patch) | |
| tree | c63f66cc5f5370ba2e1e289911d57d0115992750 | |
| parent | 9293541a882a64bcb21a845b085dc0fe4c72607c (diff) | |
Made all constructors non-inheritable
120 files changed, 1942 insertions, 1473 deletions
diff --git a/src/fltk-images-bitmaps-xbm.adb b/src/fltk-images-bitmaps-xbm.adb index 6bc9a1d..13cc5dd 100644 --- a/src/fltk-images-bitmaps-xbm.adb +++ b/src/fltk-images-bitmaps-xbm.adb @@ -40,25 +40,29 @@ package body FLTK.Images.Bitmaps.XBM is - function Create - (Filename : in String) - return XBM_Image is - begin - return This : XBM_Image do - This.Void_Ptr := new_fl_xbm_image - (Interfaces.C.To_C (Filename)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Filename : in String) + return XBM_Image is + begin + return This : XBM_Image do + This.Void_Ptr := new_fl_xbm_image + (Interfaces.C.To_C (Filename)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; end FLTK.Images.Bitmaps.XBM; diff --git a/src/fltk-images-bitmaps-xbm.ads b/src/fltk-images-bitmaps-xbm.ads index 4848576..986a192 100644 --- a/src/fltk-images-bitmaps-xbm.ads +++ b/src/fltk-images-bitmaps-xbm.ads @@ -8,9 +8,13 @@ package FLTK.Images.Bitmaps.XBM is - function Create - (Filename : in String) - return XBM_Image; + package Forge is + + function Create + (Filename : in String) + return XBM_Image; + + end Forge; private diff --git a/src/fltk-images-bitmaps.adb b/src/fltk-images-bitmaps.adb index 6d80954..7fb1a51 100644 --- a/src/fltk-images-bitmaps.adb +++ b/src/fltk-images-bitmaps.adb @@ -57,7 +57,7 @@ package body FLTK.Images.Bitmaps is function Copy (This : in Bitmap; Width, Height : in Natural) - return Bitmap is + return Bitmap'Class is begin return Copied : Bitmap do Copied.Void_Ptr := fl_bitmap_copy @@ -70,7 +70,7 @@ package body FLTK.Images.Bitmaps is function Copy (This : in Bitmap) - return Bitmap is + return Bitmap'Class is begin return Copied : Bitmap do Copied.Void_Ptr := fl_bitmap_copy2 (This.Void_Ptr); diff --git a/src/fltk-images-bitmaps.ads b/src/fltk-images-bitmaps.ads index 8f2e4bf..53229e2 100644 --- a/src/fltk-images-bitmaps.ads +++ b/src/fltk-images-bitmaps.ads @@ -11,11 +11,11 @@ package FLTK.Images.Bitmaps is function Copy (This : in Bitmap; Width, Height : in Natural) - return Bitmap; + return Bitmap'Class; function Copy (This : in Bitmap) - return Bitmap; + return Bitmap'Class; diff --git a/src/fltk-images-rgb-bmp.adb b/src/fltk-images-rgb-bmp.adb index 124cdd4..7556234 100644 --- a/src/fltk-images-rgb-bmp.adb +++ b/src/fltk-images-rgb-bmp.adb @@ -40,25 +40,29 @@ package body FLTK.Images.RGB.BMP is - function Create - (Filename : in String) - return BMP_Image is - begin - return This : BMP_Image do - This.Void_Ptr := new_fl_bmp_image - (Interfaces.C.To_C (Filename)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Filename : in String) + return BMP_Image is + begin + return This : BMP_Image do + This.Void_Ptr := new_fl_bmp_image + (Interfaces.C.To_C (Filename)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; end FLTK.Images.RGB.BMP; diff --git a/src/fltk-images-rgb-bmp.ads b/src/fltk-images-rgb-bmp.ads index 8d68d97..eed47e1 100644 --- a/src/fltk-images-rgb-bmp.ads +++ b/src/fltk-images-rgb-bmp.ads @@ -8,9 +8,13 @@ package FLTK.Images.RGB.BMP is - function Create - (Filename : in String) - return BMP_Image; + package Forge is + + function Create + (Filename : in String) + return BMP_Image; + + end Forge; private diff --git a/src/fltk-images-rgb-jpeg.adb b/src/fltk-images-rgb-jpeg.adb index a74604e..d37eb3d 100644 --- a/src/fltk-images-rgb-jpeg.adb +++ b/src/fltk-images-rgb-jpeg.adb @@ -40,25 +40,29 @@ package body FLTK.Images.RGB.JPEG is - function Create - (Filename : in String) - return JPEG_Image is - begin - return This : JPEG_Image do - This.Void_Ptr := new_fl_jpeg_image - (Interfaces.C.To_C (Filename)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Filename : in String) + return JPEG_Image is + begin + return This : JPEG_Image do + This.Void_Ptr := new_fl_jpeg_image + (Interfaces.C.To_C (Filename)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; end FLTK.Images.RGB.JPEG; diff --git a/src/fltk-images-rgb-jpeg.ads b/src/fltk-images-rgb-jpeg.ads index f467245..a443f2b 100644 --- a/src/fltk-images-rgb-jpeg.ads +++ b/src/fltk-images-rgb-jpeg.ads @@ -8,9 +8,13 @@ package FLTK.Images.RGB.JPEG is - function Create - (Filename : in String) - return JPEG_Image; + package Forge is + + function Create + (Filename : in String) + return JPEG_Image; + + end Forge; private diff --git a/src/fltk-images-rgb-png.adb b/src/fltk-images-rgb-png.adb index d50de04..9a541a8 100644 --- a/src/fltk-images-rgb-png.adb +++ b/src/fltk-images-rgb-png.adb @@ -40,25 +40,29 @@ package body FLTK.Images.RGB.PNG is - function Create - (Filename : in String) - return PNG_Image is - begin - return This : PNG_Image do - This.Void_Ptr := new_fl_png_image - (Interfaces.C.To_C (Filename)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Filename : in String) + return PNG_Image is + begin + return This : PNG_Image do + This.Void_Ptr := new_fl_png_image + (Interfaces.C.To_C (Filename)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; end FLTK.Images.RGB.PNG; diff --git a/src/fltk-images-rgb-png.ads b/src/fltk-images-rgb-png.ads index 9dcb09d..fbcb69b 100644 --- a/src/fltk-images-rgb-png.ads +++ b/src/fltk-images-rgb-png.ads @@ -8,9 +8,13 @@ package FLTK.Images.RGB.PNG is - function Create - (Filename : in String) - return PNG_Image; + package Forge is + + function Create + (Filename : in String) + return PNG_Image; + + end Forge; private diff --git a/src/fltk-images-rgb-pnm.adb b/src/fltk-images-rgb-pnm.adb index 5368b3e..51cf026 100644 --- a/src/fltk-images-rgb-pnm.adb +++ b/src/fltk-images-rgb-pnm.adb @@ -40,25 +40,29 @@ package body FLTK.Images.RGB.PNM is - function Create - (Filename : in String) - return PNM_Image is - begin - return This : PNM_Image do - This.Void_Ptr := new_fl_pnm_image - (Interfaces.C.To_C (Filename)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Filename : in String) + return PNM_Image is + begin + return This : PNM_Image do + This.Void_Ptr := new_fl_pnm_image + (Interfaces.C.To_C (Filename)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; end FLTK.Images.RGB.PNM; diff --git a/src/fltk-images-rgb-pnm.ads b/src/fltk-images-rgb-pnm.ads index 2cd8c02..f766f84 100644 --- a/src/fltk-images-rgb-pnm.ads +++ b/src/fltk-images-rgb-pnm.ads @@ -8,9 +8,13 @@ package FLTK.Images.RGB.PNM is - function Create - (Filename : in String) - return PNM_Image; + package Forge is + + function Create + (Filename : in String) + return PNM_Image; + + end Forge; private diff --git a/src/fltk-images-rgb.adb b/src/fltk-images-rgb.adb index 881b8cb..3bcd01e 100644 --- a/src/fltk-images-rgb.adb +++ b/src/fltk-images-rgb.adb @@ -70,7 +70,7 @@ package body FLTK.Images.RGB is function Copy (This : in RGB_Image; Width, Height : in Natural) - return RGB_Image is + return RGB_Image'Class is begin return Copied : RGB_Image do Copied.Void_Ptr := fl_rgb_image_copy @@ -83,7 +83,7 @@ package body FLTK.Images.RGB is function Copy (This : in RGB_Image) - return RGB_Image is + return RGB_Image'Class is begin return Copied : RGB_Image do Copied.Void_Ptr := fl_rgb_image_copy2 (This.Void_Ptr); diff --git a/src/fltk-images-rgb.ads b/src/fltk-images-rgb.ads index f34c34a..c807468 100644 --- a/src/fltk-images-rgb.ads +++ b/src/fltk-images-rgb.ads @@ -11,11 +11,11 @@ package FLTK.Images.RGB is function Copy (This : in RGB_Image; Width, Height : in Natural) - return RGB_Image; + return RGB_Image'Class; function Copy (This : in RGB_Image) - return RGB_Image; + return RGB_Image'Class; diff --git a/src/fltk-images.adb b/src/fltk-images.adb index 5d72e6d..42226e2 100644 --- a/src/fltk-images.adb +++ b/src/fltk-images.adb @@ -107,33 +107,39 @@ package body FLTK.Images is - function Create - (Width, Height, Depth : in Natural) - return Image is - begin - return This : Image do - This.Void_Ptr := new_fl_image - (Interfaces.C.int (Width), - Interfaces.C.int (Height), - Interfaces.C.int (Depth)); - case fl_image_fail (This.Void_Ptr) is - when 1 => - raise No_Image_Error; - when 2 => - raise File_Access_Error; - when 3 => - raise Format_Error; - when others => - null; - end case; - end return; - end Create; + package body Forge is + + function Create + (Width, Height, Depth : in Natural) + return Image is + begin + return This : Image do + This.Void_Ptr := new_fl_image + (Interfaces.C.int (Width), + Interfaces.C.int (Height), + Interfaces.C.int (Depth)); + case fl_image_fail (This.Void_Ptr) is + when 1 => + raise No_Image_Error; + when 2 => + raise File_Access_Error; + when 3 => + raise Format_Error; + when others => + null; + end case; + end return; + end Create; + + end Forge; + + function Copy (This : in Image; Width, Height : in Natural) - return Image is + return Image'Class is begin return Copied : Image do Copied.Void_Ptr := fl_image_copy @@ -146,7 +152,7 @@ package body FLTK.Images is function Copy (This : in Image) - return Image is + return Image'Class is begin return Copied : Image do Copied.Void_Ptr := fl_image_copy2 (This.Void_Ptr); diff --git a/src/fltk-images.ads b/src/fltk-images.ads index a3138e9..86ddbdb 100644 --- a/src/fltk-images.ads +++ b/src/fltk-images.ads @@ -12,18 +12,25 @@ package FLTK.Images is - function Create - (Width, Height, Depth : in Natural) - return Image; + package Forge is + + function Create + (Width, Height, Depth : in Natural) + return Image; + + end Forge; + + + function Copy (This : in Image; Width, Height : in Natural) - return Image; + return Image'Class; function Copy (This : in Image) - return Image; + return Image'Class; diff --git a/src/fltk-text_buffers.adb b/src/fltk-text_buffers.adb index a91f7e1..394ff02 100644 --- a/src/fltk-text_buffers.adb +++ b/src/fltk-text_buffers.adb @@ -232,21 +232,25 @@ package body FLTK.Text_Buffers is - function Create - (Requested_Size : in Natural := 0; - Preferred_Gap_Size : in Natural := 1024) - return Text_Buffer is - begin - return This : Text_Buffer do - This.Void_Ptr := new_fl_text_buffer - (Interfaces.C.int (Requested_Size), - Interfaces.C.int (Preferred_Gap_Size)); - - This.Modify_CBs := Modify_Vectors.Empty_Vector; - This.Predelete_CBs := Predelete_Vectors.Empty_Vector; - This.CB_Active := True; - end return; - end Create; + package body Forge is + + function Create + (Requested_Size : in Natural := 0; + Preferred_Gap_Size : in Natural := 1024) + return Text_Buffer is + begin + return This : Text_Buffer do + This.Void_Ptr := new_fl_text_buffer + (Interfaces.C.int (Requested_Size), + Interfaces.C.int (Preferred_Gap_Size)); + + This.Modify_CBs := Modify_Vectors.Empty_Vector; + This.Predelete_CBs := Predelete_Vectors.Empty_Vector; + This.CB_Active := True; + end return; + end Create; + + end Forge; diff --git a/src/fltk-text_buffers.ads b/src/fltk-text_buffers.ads index 1648915..ea66f6f 100644 --- a/src/fltk-text_buffers.ads +++ b/src/fltk-text_buffers.ads @@ -32,10 +32,14 @@ package FLTK.Text_Buffers is - function Create - (Requested_Size : in Natural := 0; - Preferred_Gap_Size : in Natural := 1024) - return Text_Buffer; + package Forge is + + function Create + (Requested_Size : in Natural := 0; + Preferred_Gap_Size : in Natural := 1024) + return Text_Buffer; + + end Forge; diff --git a/src/fltk-widgets-boxes.adb b/src/fltk-widgets-boxes.adb index c8ef70b..27aed8f 100644 --- a/src/fltk-widgets-boxes.adb +++ b/src/fltk-widgets-boxes.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Boxes is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Box is - begin - return This : Box do - This.Void_Ptr := new_fl_box - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - box_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - box_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Box is + begin + return This : Box do + This.Void_Ptr := new_fl_box + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + box_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + box_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-boxes.ads b/src/fltk-widgets-boxes.ads index b31bdf5..99962ba 100644 --- a/src/fltk-widgets-boxes.ads +++ b/src/fltk-widgets-boxes.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Boxes is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Box; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Box; + + end Forge; diff --git a/src/fltk-widgets-buttons-enter.adb b/src/fltk-widgets-buttons-enter.adb index 71acd7f..2fcb2a8 100644 --- a/src/fltk-widgets-buttons-enter.adb +++ b/src/fltk-widgets-buttons-enter.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Enter is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Enter_Button is - begin - return This : Enter_Button do - This.Void_Ptr := new_fl_return_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - return_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - return_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Enter_Button is + begin + return This : Enter_Button do + This.Void_Ptr := new_fl_return_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + return_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + return_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-enter.ads b/src/fltk-widgets-buttons-enter.ads index e56e141..1b9ceab 100644 --- a/src/fltk-widgets-buttons-enter.ads +++ b/src/fltk-widgets-buttons-enter.ads @@ -11,10 +11,14 @@ package FLTK.Widgets.Buttons.Enter is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Enter_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Enter_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-check.adb b/src/fltk-widgets-buttons-light-check.adb index b367cd3..df54720 100644 --- a/src/fltk-widgets-buttons-light-check.adb +++ b/src/fltk-widgets-buttons-light-check.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Light.Check is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Check_Button is - begin - return This : Check_Button do - This.Void_Ptr := new_fl_check_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - check_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - check_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Check_Button is + begin + return This : Check_Button do + This.Void_Ptr := new_fl_check_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + check_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + check_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-check.ads b/src/fltk-widgets-buttons-light-check.ads index f4351ef..0e746d9 100644 --- a/src/fltk-widgets-buttons-light-check.ads +++ b/src/fltk-widgets-buttons-light-check.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Light.Check is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Check_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Check_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-radio.adb b/src/fltk-widgets-buttons-light-radio.adb index 0317616..6df1abd 100644 --- a/src/fltk-widgets-buttons-light-radio.adb +++ b/src/fltk-widgets-buttons-light-radio.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Light.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Light_Button is - begin - return This : Radio_Light_Button do - This.Void_Ptr := new_fl_radio_light_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - radio_light_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - radio_light_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Light_Button is + begin + return This : Radio_Light_Button do + This.Void_Ptr := new_fl_radio_light_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + radio_light_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + radio_light_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-radio.ads b/src/fltk-widgets-buttons-light-radio.ads index 47d5236..6536d5d 100644 --- a/src/fltk-widgets-buttons-light-radio.ads +++ b/src/fltk-widgets-buttons-light-radio.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Light.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Light_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Light_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-round-radio.adb b/src/fltk-widgets-buttons-light-round-radio.adb index f8ce436..6bdc8b3 100644 --- a/src/fltk-widgets-buttons-light-round-radio.adb +++ b/src/fltk-widgets-buttons-light-round-radio.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Light.Round.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Round_Button is - begin - return This : Radio_Round_Button do - This.Void_Ptr := new_fl_radio_round_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - radio_round_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - radio_round_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Round_Button is + begin + return This : Radio_Round_Button do + This.Void_Ptr := new_fl_radio_round_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + radio_round_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + radio_round_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-round-radio.ads b/src/fltk-widgets-buttons-light-round-radio.ads index 8c0ec28..00a3c90 100644 --- a/src/fltk-widgets-buttons-light-round-radio.ads +++ b/src/fltk-widgets-buttons-light-round-radio.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Light.Round.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Round_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Round_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-round.adb b/src/fltk-widgets-buttons-light-round.adb index 7b10003..3287308 100644 --- a/src/fltk-widgets-buttons-light-round.adb +++ b/src/fltk-widgets-buttons-light-round.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Light.Round is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Round_Button is - begin - return This : Round_Button do - This.Void_Ptr := new_fl_round_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - round_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - round_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Round_Button is + begin + return This : Round_Button do + This.Void_Ptr := new_fl_round_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + round_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + round_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-light-round.ads b/src/fltk-widgets-buttons-light-round.ads index 183e953..22736b6 100644 --- a/src/fltk-widgets-buttons-light-round.ads +++ b/src/fltk-widgets-buttons-light-round.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Light.Round is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Round_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Round_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-light.adb b/src/fltk-widgets-buttons-light.adb index 9029b3b..21c9efc 100644 --- a/src/fltk-widgets-buttons-light.adb +++ b/src/fltk-widgets-buttons-light.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Light is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Light_Button is - begin - return This : Light_Button do - This.Void_Ptr := new_fl_light_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - light_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - light_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Light_Button is + begin + return This : Light_Button do + This.Void_Ptr := new_fl_light_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + light_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + light_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-light.ads b/src/fltk-widgets-buttons-light.ads index e999536..b7429ed 100644 --- a/src/fltk-widgets-buttons-light.ads +++ b/src/fltk-widgets-buttons-light.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Light is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Light_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Light_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-radio.adb b/src/fltk-widgets-buttons-radio.adb index 26388a8..6a5ff01 100644 --- a/src/fltk-widgets-buttons-radio.adb +++ b/src/fltk-widgets-buttons-radio.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Button is - begin - return This : Radio_Button do - This.Void_Ptr := new_fl_radio_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - radio_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - radio_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Button is + begin + return This : Radio_Button do + This.Void_Ptr := new_fl_radio_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + radio_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + radio_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-radio.ads b/src/fltk-widgets-buttons-radio.ads index 97be6fb..b62847a 100644 --- a/src/fltk-widgets-buttons-radio.ads +++ b/src/fltk-widgets-buttons-radio.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Radio is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Radio_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Radio_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-repeat.adb b/src/fltk-widgets-buttons-repeat.adb index 3d1ca90..7bbc6b1 100644 --- a/src/fltk-widgets-buttons-repeat.adb +++ b/src/fltk-widgets-buttons-repeat.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Repeat is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Repeat_Button is - begin - return This : Repeat_Button do - This.Void_Ptr := new_fl_repeat_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - repeat_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - repeat_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Repeat_Button is + begin + return This : Repeat_Button do + This.Void_Ptr := new_fl_repeat_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + repeat_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + repeat_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-repeat.ads b/src/fltk-widgets-buttons-repeat.ads index 179e92e..2f495db 100644 --- a/src/fltk-widgets-buttons-repeat.ads +++ b/src/fltk-widgets-buttons-repeat.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Repeat is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Repeat_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Repeat_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons-toggle.adb b/src/fltk-widgets-buttons-toggle.adb index bf4074a..60f8de3 100644 --- a/src/fltk-widgets-buttons-toggle.adb +++ b/src/fltk-widgets-buttons-toggle.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Buttons.Toggle is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Toggle_Button is - begin - return This : Toggle_Button do - This.Void_Ptr := new_fl_toggle_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - toggle_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - toggle_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Toggle_Button is + begin + return This : Toggle_Button do + This.Void_Ptr := new_fl_toggle_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + toggle_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + toggle_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons-toggle.ads b/src/fltk-widgets-buttons-toggle.ads index 5d75cf9..d2f26a1 100644 --- a/src/fltk-widgets-buttons-toggle.ads +++ b/src/fltk-widgets-buttons-toggle.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Buttons.Toggle is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Toggle_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Toggle_Button; + + end Forge; diff --git a/src/fltk-widgets-buttons.adb b/src/fltk-widgets-buttons.adb index 45b3a6e..5e7e18c 100644 --- a/src/fltk-widgets-buttons.adb +++ b/src/fltk-widgets-buttons.adb @@ -82,25 +82,29 @@ package body FLTK.Widgets.Buttons is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Button is - begin - return This : Button do - This.Void_Ptr := new_fl_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Button is + begin + return This : Button do + This.Void_Ptr := new_fl_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-buttons.ads b/src/fltk-widgets-buttons.ads index 0cf2c61..55d75c6 100644 --- a/src/fltk-widgets-buttons.ads +++ b/src/fltk-widgets-buttons.ads @@ -10,10 +10,14 @@ package FLTK.Widgets.Buttons is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Button; + + end Forge; diff --git a/src/fltk-widgets-clocks-updated-round.adb b/src/fltk-widgets-clocks-updated-round.adb index 9e03e67..c87cb7b 100644 --- a/src/fltk-widgets-clocks-updated-round.adb +++ b/src/fltk-widgets-clocks-updated-round.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Clocks.Updated.Round is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Round_Clock is - begin - return This : Round_Clock do - This.Void_Ptr := new_fl_round_clock - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - round_clock_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - round_clock_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Round_Clock is + begin + return This : Round_Clock do + This.Void_Ptr := new_fl_round_clock + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + round_clock_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + round_clock_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-clocks-updated-round.ads b/src/fltk-widgets-clocks-updated-round.ads index 5f68382..17f05b3 100644 --- a/src/fltk-widgets-clocks-updated-round.ads +++ b/src/fltk-widgets-clocks-updated-round.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Clocks.Updated.Round is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Round_Clock; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Round_Clock; + + end Forge; diff --git a/src/fltk-widgets-clocks-updated.adb b/src/fltk-widgets-clocks-updated.adb index e193962..d55521e 100644 --- a/src/fltk-widgets-clocks-updated.adb +++ b/src/fltk-widgets-clocks-updated.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Clocks.Updated is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Updated_Clock is - begin - return This : Updated_Clock do - This.Void_Ptr := new_fl_clock - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - clock_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - clock_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Updated_Clock is + begin + return This : Updated_Clock do + This.Void_Ptr := new_fl_clock + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + clock_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + clock_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-clocks-updated.ads b/src/fltk-widgets-clocks-updated.ads index bcfc59b..35bff2c 100644 --- a/src/fltk-widgets-clocks-updated.ads +++ b/src/fltk-widgets-clocks-updated.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Clocks.Updated is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Updated_Clock; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Updated_Clock; + + end Forge; diff --git a/src/fltk-widgets-clocks.adb b/src/fltk-widgets-clocks.adb index f409af5..5fd3ec2 100644 --- a/src/fltk-widgets-clocks.adb +++ b/src/fltk-widgets-clocks.adb @@ -101,25 +101,29 @@ package body FLTK.Widgets.Clocks is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Clock is - begin - return This : Clock do - This.Void_Ptr := new_fl_clock_output - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - clock_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - clock_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Clock is + begin + return This : Clock do + This.Void_Ptr := new_fl_clock_output + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + clock_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + clock_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-clocks.ads b/src/fltk-widgets-clocks.ads index d78fd45..eb8acfc 100644 --- a/src/fltk-widgets-clocks.ads +++ b/src/fltk-widgets-clocks.ads @@ -14,10 +14,14 @@ package FLTK.Widgets.Clocks is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Clock; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Clock; + + end Forge; diff --git a/src/fltk-widgets-groups-scrolls.adb b/src/fltk-widgets-groups-scrolls.adb index 376a2ac..d90271d 100644 --- a/src/fltk-widgets-groups-scrolls.adb +++ b/src/fltk-widgets-groups-scrolls.adb @@ -102,26 +102,30 @@ package body FLTK.Widgets.Groups.Scrolls is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Scroll is - begin - return This : Scroll do - This.Void_Ptr := new_fl_scroll - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - scroll_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - scroll_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Scroll is + begin + return This : Scroll do + This.Void_Ptr := new_fl_scroll + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + scroll_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + scroll_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-scrolls.ads b/src/fltk-widgets-groups-scrolls.ads index 5299cf8..111af90 100644 --- a/src/fltk-widgets-groups-scrolls.ads +++ b/src/fltk-widgets-groups-scrolls.ads @@ -17,10 +17,14 @@ package FLTK.Widgets.Groups.Scrolls is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Scroll; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Scroll; + + end Forge; diff --git a/src/fltk-widgets-groups-tabbed.adb b/src/fltk-widgets-groups-tabbed.adb index 70bfdc6..e7689cd 100644 --- a/src/fltk-widgets-groups-tabbed.adb +++ b/src/fltk-widgets-groups-tabbed.adb @@ -102,26 +102,30 @@ package body FLTK.Widgets.Groups.Tabbed is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Tabs is - begin - return This : Tabs do - This.Void_Ptr := new_fl_tabs - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - tabs_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - tabs_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Tabs is + begin + return This : Tabs do + This.Void_Ptr := new_fl_tabs + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + tabs_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + tabs_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-tabbed.ads b/src/fltk-widgets-groups-tabbed.ads index d11d9fd..0973e9f 100644 --- a/src/fltk-widgets-groups-tabbed.ads +++ b/src/fltk-widgets-groups-tabbed.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Groups.Tabbed is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Tabs; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Tabs; + + end Forge; diff --git a/src/fltk-widgets-groups-text_displays-text_editors.adb b/src/fltk-widgets-groups-text_displays-text_editors.adb index f54fac8..af3caea 100644 --- a/src/fltk-widgets-groups-text_displays-text_editors.adb +++ b/src/fltk-widgets-groups-text_displays-text_editors.adb @@ -370,65 +370,69 @@ package body FLTK.Widgets.Groups.Text_Displays.Text_Editors is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Text_Editor - is - use type Interfaces.C.int; - begin - return This : Text_Editor do - This.Void_Ptr := new_fl_text_editor - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - text_editor_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - text_editor_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - - -- change things over so key bindings are all handled from the Ada side - This.Bindings := Binding_Vectors.Empty_Vector; - for B of Default_Key_Bindings loop - This.Bindings.Append (B); - end loop; - This.Default_Func := Default'Access; - - -- remove these loops and uncomment subsequent "remove_all_key_bindings" - -- when FLTK keybindings fixed - for B of To_Remove_List loop - fl_text_editor_remove_key_binding - (This.Void_Ptr, - Interfaces.C.int (B.Press), - B.Modif * 65536); - end loop; - for B of To_Remove_Weird loop - fl_text_editor_remove_key_binding + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Text_Editor + is + use type Interfaces.C.int; + begin + return This : Text_Editor do + This.Void_Ptr := new_fl_text_editor + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data (This.Void_Ptr, - Interfaces.C.int (B.Press), - B.Modif); - end loop; - -- fl_text_editor_remove_all_key_bindings (This.Void_Ptr); - - fl_text_editor_set_default_key_function (This.Void_Ptr, Key_Func_Hook'Address); - - -- this is irritatingly required due to how FLTK handles certain keys - for B of Default_Key_Bindings loop - -- remove this conditional once FLTK keybindings fixed - if B.Key.Modifier = Mod_None then - fl_text_editor_add_key_binding + Widget_Convert.To_Address (This'Unchecked_Access)); + text_editor_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + text_editor_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + + -- change things over so key bindings are all handled from the Ada side + This.Bindings := Binding_Vectors.Empty_Vector; + for B of Default_Key_Bindings loop + This.Bindings.Append (B); + end loop; + This.Default_Func := Default'Access; + + -- remove these loops and uncomment subsequent "remove_all_key_bindings" + -- when FLTK keybindings fixed + for B of To_Remove_List loop + fl_text_editor_remove_key_binding + (This.Void_Ptr, + Interfaces.C.int (B.Press), + B.Modif * 65536); + end loop; + for B of To_Remove_Weird loop + fl_text_editor_remove_key_binding (This.Void_Ptr, - Interfaces.C.int (B.Key.Keypress), - Interfaces.C.int (B.Key.Modifier) * 65536, - Key_Func_Hook'Address); - end if; - end loop; - end return; - end Create; + Interfaces.C.int (B.Press), + B.Modif); + end loop; + -- fl_text_editor_remove_all_key_bindings (This.Void_Ptr); + + fl_text_editor_set_default_key_function (This.Void_Ptr, Key_Func_Hook'Address); + + -- this is irritatingly required due to how FLTK handles certain keys + for B of Default_Key_Bindings loop + -- remove this conditional once FLTK keybindings fixed + if B.Key.Modifier = Mod_None then + fl_text_editor_add_key_binding + (This.Void_Ptr, + Interfaces.C.int (B.Key.Keypress), + Interfaces.C.int (B.Key.Modifier) * 65536, + Key_Func_Hook'Address); + end if; + end loop; + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-text_displays-text_editors.ads b/src/fltk-widgets-groups-text_displays-text_editors.ads index b21cc3b..06e8214 100644 --- a/src/fltk-widgets-groups-text_displays-text_editors.ads +++ b/src/fltk-widgets-groups-text_displays-text_editors.ads @@ -31,10 +31,14 @@ package FLTK.Widgets.Groups.Text_Displays.Text_Editors is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Text_Editor; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Text_Editor; + + end Forge; diff --git a/src/fltk-widgets-groups-text_displays.adb b/src/fltk-widgets-groups-text_displays.adb index 42ad88c..4548708 100644 --- a/src/fltk-widgets-groups-text_displays.adb +++ b/src/fltk-widgets-groups-text_displays.adb @@ -376,26 +376,30 @@ package body FLTK.Widgets.Groups.Text_Displays is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Text_Display is - begin - return This : Text_Display do - This.Void_Ptr := new_fl_text_display - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - text_display_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - text_display_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Text_Display is + begin + return This : Text_Display do + This.Void_Ptr := new_fl_text_display + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + text_display_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + text_display_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-text_displays.ads b/src/fltk-widgets-groups-text_displays.ads index 473a974..6262125 100644 --- a/src/fltk-widgets-groups-text_displays.ads +++ b/src/fltk-widgets-groups-text_displays.ads @@ -18,10 +18,14 @@ package FLTK.Widgets.Groups.Text_Displays is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Text_Display; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Text_Display; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-double.adb b/src/fltk-widgets-groups-windows-double.adb index dd8e2d2..ba4c8b8 100644 --- a/src/fltk-widgets-groups-windows-double.adb +++ b/src/fltk-widgets-groups-windows-double.adb @@ -86,44 +86,48 @@ package body FLTK.Widgets.Groups.Windows.Double is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Double_Window is - begin - return This : Double_Window do - This.Void_Ptr := new_fl_double_window - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; - - - function Create - (W, H : in Integer) - return Double_Window is - begin - return This : Double_Window do - This.Void_Ptr := new_fl_double_window2 - (Interfaces.C.int (W), - Interfaces.C.int (H)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Double_Window is + begin + return This : Double_Window do + This.Void_Ptr := new_fl_double_window + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + function Create + (W, H : in Integer) + return Double_Window is + begin + return This : Double_Window do + This.Void_Ptr := new_fl_double_window2 + (Interfaces.C.int (W), + Interfaces.C.int (H)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-double.ads b/src/fltk-widgets-groups-windows-double.ads index 02576e1..8f566b7 100644 --- a/src/fltk-widgets-groups-windows-double.ads +++ b/src/fltk-widgets-groups-windows-double.ads @@ -8,14 +8,18 @@ package FLTK.Widgets.Groups.Windows.Double is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Double_Window; - - function Create - (W, H : in Integer) - return Double_Window; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Double_Window; + + function Create + (W, H : in Integer) + return Double_Window; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-single-menu.adb b/src/fltk-widgets-groups-windows-single-menu.adb index 18902a6..f48021f 100644 --- a/src/fltk-widgets-groups-windows-single-menu.adb +++ b/src/fltk-widgets-groups-windows-single-menu.adb @@ -103,44 +103,48 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Window is - begin - return This : Menu_Window do - This.Void_Ptr := new_fl_menu_window - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; - - - function Create - (W, H : in Integer) - return Menu_Window is - begin - return This : Menu_Window do - This.Void_Ptr := new_fl_menu_window2 - (Interfaces.C.int (W), - Interfaces.C.int (H)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Window is + begin + return This : Menu_Window do + This.Void_Ptr := new_fl_menu_window + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + function Create + (W, H : in Integer) + return Menu_Window is + begin + return This : Menu_Window do + This.Void_Ptr := new_fl_menu_window2 + (Interfaces.C.int (W), + Interfaces.C.int (H)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-single-menu.ads b/src/fltk-widgets-groups-windows-single-menu.ads index 8f5ea00..1ec5c1c 100644 --- a/src/fltk-widgets-groups-windows-single-menu.ads +++ b/src/fltk-widgets-groups-windows-single-menu.ads @@ -8,14 +8,18 @@ package FLTK.Widgets.Groups.Windows.Single.Menu is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Window; - - function Create - (W, H : in Integer) - return Menu_Window; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Window; + + function Create + (W, H : in Integer) + return Menu_Window; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-single.adb b/src/fltk-widgets-groups-windows-single.adb index 94ee03c..22ca4a5 100644 --- a/src/fltk-widgets-groups-windows-single.adb +++ b/src/fltk-widgets-groups-windows-single.adb @@ -82,44 +82,48 @@ package body FLTK.Widgets.Groups.Windows.Single is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Single_Window is - begin - return This : Single_Window do - This.Void_Ptr := new_fl_single_window - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; - - - function Create - (W, H : in Integer) - return Single_Window is - begin - return This : Single_Window do - This.Void_Ptr := new_fl_single_window2 - (Interfaces.C.int (W), - Interfaces.C.int (H)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Single_Window is + begin + return This : Single_Window do + This.Void_Ptr := new_fl_single_window + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + function Create + (W, H : in Integer) + return Single_Window is + begin + return This : Single_Window do + This.Void_Ptr := new_fl_single_window2 + (Interfaces.C.int (W), + Interfaces.C.int (H)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-windows-single.ads b/src/fltk-widgets-groups-windows-single.ads index 4765ce7..e33597c 100644 --- a/src/fltk-widgets-groups-windows-single.ads +++ b/src/fltk-widgets-groups-windows-single.ads @@ -8,14 +8,18 @@ package FLTK.Widgets.Groups.Windows.Single is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Single_Window; - - function Create - (W, H : in Integer) - return Single_Window; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Single_Window; + + function Create + (W, H : in Integer) + return Single_Window; + + end Forge; diff --git a/src/fltk-widgets-groups-windows.adb b/src/fltk-widgets-groups-windows.adb index 893d53a..13a2aa1 100644 --- a/src/fltk-widgets-groups-windows.adb +++ b/src/fltk-widgets-groups-windows.adb @@ -155,44 +155,48 @@ package body FLTK.Widgets.Groups.Windows is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Window is - begin - return This : Window do - This.Void_Ptr := new_fl_window - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; - - - function Create - (W, H : in Integer) - return Window is - begin - return This : Window do - This.Void_Ptr := new_fl_window2 - (Interfaces.C.int (W), - Interfaces.C.int (H)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Window is + begin + return This : Window do + This.Void_Ptr := new_fl_window + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + function Create + (W, H : in Integer) + return Window is + begin + return This : Window do + This.Void_Ptr := new_fl_window2 + (Interfaces.C.int (W), + Interfaces.C.int (H)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-windows.ads b/src/fltk-widgets-groups-windows.ads index 9d1cefc..3ea38c1 100644 --- a/src/fltk-widgets-groups-windows.ads +++ b/src/fltk-widgets-groups-windows.ads @@ -26,14 +26,18 @@ package FLTK.Widgets.Groups.Windows is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Window; - - function Create - (W, H : in Integer) - return Window; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Window; + + function Create + (W, H : in Integer) + return Window; + + end Forge; diff --git a/src/fltk-widgets-groups-wizards.adb b/src/fltk-widgets-groups-wizards.adb index ff9bc92..84c70ae 100644 --- a/src/fltk-widgets-groups-wizards.adb +++ b/src/fltk-widgets-groups-wizards.adb @@ -89,26 +89,30 @@ package body FLTK.Widgets.Groups.Wizards is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Wizard is - begin - return This : Wizard do - This.Void_Ptr := new_fl_wizard - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - wizard_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - wizard_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Wizard is + begin + return This : Wizard do + This.Void_Ptr := new_fl_wizard + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + wizard_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + wizard_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups-wizards.ads b/src/fltk-widgets-groups-wizards.ads index 63221db..50148d0 100644 --- a/src/fltk-widgets-groups-wizards.ads +++ b/src/fltk-widgets-groups-wizards.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Groups.Wizards is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Wizard; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Wizard; + + end Forge; diff --git a/src/fltk-widgets-groups.adb b/src/fltk-widgets-groups.adb index 5d21d1f..268f3ad 100644 --- a/src/fltk-widgets-groups.adb +++ b/src/fltk-widgets-groups.adb @@ -139,26 +139,30 @@ package body FLTK.Widgets.Groups is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Group is - begin - return This : Group do - This.Void_Ptr := new_fl_group - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_group_end (This.Void_Ptr); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - group_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - group_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Group is + begin + return This : Group do + This.Void_Ptr := new_fl_group + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_group_end (This.Void_Ptr); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + group_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + group_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-groups.ads b/src/fltk-widgets-groups.ads index eeeb564..53ada82 100644 --- a/src/fltk-widgets-groups.ads +++ b/src/fltk-widgets-groups.ads @@ -16,10 +16,14 @@ package FLTK.Widgets.Groups is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Group; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Group; + + end Forge; diff --git a/src/fltk-widgets-inputs-file.adb b/src/fltk-widgets-inputs-file.adb index 7f9d6ad..4f7ffdf 100644 --- a/src/fltk-widgets-inputs-file.adb +++ b/src/fltk-widgets-inputs-file.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.File is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return File_Input is - begin - return This : File_Input do - This.Void_Ptr := new_fl_file_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - file_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - file_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return File_Input is + begin + return This : File_Input do + This.Void_Ptr := new_fl_file_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + file_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + file_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-file.ads b/src/fltk-widgets-inputs-file.ads index 87d42bf..e3bdb45 100644 --- a/src/fltk-widgets-inputs-file.ads +++ b/src/fltk-widgets-inputs-file.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.File is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return File_Input; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return File_Input; + + end Forge; diff --git a/src/fltk-widgets-inputs-float.adb b/src/fltk-widgets-inputs-float.adb index 02f491f..249b99b 100644 --- a/src/fltk-widgets-inputs-float.adb +++ b/src/fltk-widgets-inputs-float.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Float is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Float_Input is - begin - return This : Float_Input do - This.Void_Ptr := new_fl_float_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - float_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - float_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Float_Input is + begin + return This : Float_Input do + This.Void_Ptr := new_fl_float_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + float_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + float_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-float.ads b/src/fltk-widgets-inputs-float.ads index 68c07f4..1df1a98 100644 --- a/src/fltk-widgets-inputs-float.ads +++ b/src/fltk-widgets-inputs-float.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Float is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Float_Input; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Float_Input; + + end Forge; diff --git a/src/fltk-widgets-inputs-integer.adb b/src/fltk-widgets-inputs-integer.adb index b9b4eff..b82545a 100644 --- a/src/fltk-widgets-inputs-integer.adb +++ b/src/fltk-widgets-inputs-integer.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Integer is - function Create - (X, Y, W, H : in Standard.Integer; - Text : in String) - return Integer_Input is - begin - return This : Integer_Input do - This.Void_Ptr := new_fl_int_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - int_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - int_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Standard.Integer; + Text : in String) + return Integer_Input is + begin + return This : Integer_Input do + This.Void_Ptr := new_fl_int_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + int_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + int_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-integer.ads b/src/fltk-widgets-inputs-integer.ads index c32615b..bde356c 100644 --- a/src/fltk-widgets-inputs-integer.ads +++ b/src/fltk-widgets-inputs-integer.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Integer is - function Create - (X, Y, W, H : in Standard.Integer; - Text : in String) - return Integer_Input; + package Forge is + + function Create + (X, Y, W, H : in Standard.Integer; + Text : in String) + return Integer_Input; + + end Forge; diff --git a/src/fltk-widgets-inputs-multiline.adb b/src/fltk-widgets-inputs-multiline.adb index e36414d..43a51fe 100644 --- a/src/fltk-widgets-inputs-multiline.adb +++ b/src/fltk-widgets-inputs-multiline.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Multiline is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Multiline_Input is - begin - return This : Multiline_Input do - This.Void_Ptr := new_fl_multiline_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - multiline_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - multiline_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Multiline_Input is + begin + return This : Multiline_Input do + This.Void_Ptr := new_fl_multiline_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + multiline_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + multiline_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-multiline.ads b/src/fltk-widgets-inputs-multiline.ads index f9ba49b..81cab45 100644 --- a/src/fltk-widgets-inputs-multiline.ads +++ b/src/fltk-widgets-inputs-multiline.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Multiline is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Multiline_Input; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Multiline_Input; + + end Forge; diff --git a/src/fltk-widgets-inputs-outputs-multiline.adb b/src/fltk-widgets-inputs-outputs-multiline.adb index 41748ff..bf67397 100644 --- a/src/fltk-widgets-inputs-outputs-multiline.adb +++ b/src/fltk-widgets-inputs-outputs-multiline.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Outputs.Multiline is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Multiline_Output is - begin - return This : Multiline_Output do - This.Void_Ptr := new_fl_multiline_output - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - multiline_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - multiline_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Multiline_Output is + begin + return This : Multiline_Output do + This.Void_Ptr := new_fl_multiline_output + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + multiline_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + multiline_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-outputs-multiline.ads b/src/fltk-widgets-inputs-outputs-multiline.ads index 4d53fa0..8a86280 100644 --- a/src/fltk-widgets-inputs-outputs-multiline.ads +++ b/src/fltk-widgets-inputs-outputs-multiline.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Outputs.Multiline is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Multiline_Output; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Multiline_Output; + + end Forge; diff --git a/src/fltk-widgets-inputs-outputs.adb b/src/fltk-widgets-inputs-outputs.adb index 8db5671..00c7d0c 100644 --- a/src/fltk-widgets-inputs-outputs.adb +++ b/src/fltk-widgets-inputs-outputs.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Outputs is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Output is - begin - return This : Output do - This.Void_Ptr := new_fl_output - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Output is + begin + return This : Output do + This.Void_Ptr := new_fl_output + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-outputs.ads b/src/fltk-widgets-inputs-outputs.ads index 677c746..f686414 100644 --- a/src/fltk-widgets-inputs-outputs.ads +++ b/src/fltk-widgets-inputs-outputs.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Outputs is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Output; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Output; + + end Forge; diff --git a/src/fltk-widgets-inputs-secret.adb b/src/fltk-widgets-inputs-secret.adb index ba04668..064c364 100644 --- a/src/fltk-widgets-inputs-secret.adb +++ b/src/fltk-widgets-inputs-secret.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs.Secret is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Secret_Input is - begin - return This : Secret_Input do - This.Void_Ptr := new_fl_secret_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - secret_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - secret_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Secret_Input is + begin + return This : Secret_Input do + This.Void_Ptr := new_fl_secret_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + secret_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + secret_input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs-secret.ads b/src/fltk-widgets-inputs-secret.ads index 142cfcc..53ccaad 100644 --- a/src/fltk-widgets-inputs-secret.ads +++ b/src/fltk-widgets-inputs-secret.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Inputs.Secret is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Secret_Input; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Secret_Input; + + end Forge; diff --git a/src/fltk-widgets-inputs.adb b/src/fltk-widgets-inputs.adb index 633ede7..6d2ee20 100644 --- a/src/fltk-widgets-inputs.adb +++ b/src/fltk-widgets-inputs.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Inputs is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Input is - begin - return This : Input do - This.Void_Ptr := new_fl_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Input is + begin + return This : Input do + This.Void_Ptr := new_fl_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + input_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-inputs.ads b/src/fltk-widgets-inputs.ads index 9f69795..9c80b81 100644 --- a/src/fltk-widgets-inputs.ads +++ b/src/fltk-widgets-inputs.ads @@ -14,10 +14,14 @@ package FLTK.Widgets.Inputs is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Input; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Input; + + end Forge; diff --git a/src/fltk-widgets-menus-menu_bars.adb b/src/fltk-widgets-menus-menu_bars.adb index c21e6e9..b8b58b6 100644 --- a/src/fltk-widgets-menus-menu_bars.adb +++ b/src/fltk-widgets-menus-menu_bars.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Menus.Menu_Bars is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Bar is - begin - return This : Menu_Bar do - This.Void_Ptr := new_fl_menu_bar - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_bar_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_bar_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Bar is + begin + return This : Menu_Bar do + This.Void_Ptr := new_fl_menu_bar + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + menu_bar_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + menu_bar_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-menus-menu_bars.ads b/src/fltk-widgets-menus-menu_bars.ads index d273b75..03b2900 100644 --- a/src/fltk-widgets-menus-menu_bars.ads +++ b/src/fltk-widgets-menus-menu_bars.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Menus.Menu_Bars is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Bar; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Bar; + + end Forge; diff --git a/src/fltk-widgets-menus-menu_buttons.adb b/src/fltk-widgets-menus-menu_buttons.adb index 947147d..1a8e17b 100644 --- a/src/fltk-widgets-menus-menu_buttons.adb +++ b/src/fltk-widgets-menus-menu_buttons.adb @@ -73,25 +73,29 @@ package body FLTK.Widgets.Menus.Menu_Buttons is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Button is - begin - return This : Menu_Button do - This.Void_Ptr := new_fl_menu_button - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Button is + begin + return This : Menu_Button do + This.Void_Ptr := new_fl_menu_button + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + menu_button_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + menu_button_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-menus-menu_buttons.ads b/src/fltk-widgets-menus-menu_buttons.ads index 47b1e1c..86e29bb 100644 --- a/src/fltk-widgets-menus-menu_buttons.ads +++ b/src/fltk-widgets-menus-menu_buttons.ads @@ -11,10 +11,14 @@ package FLTK.Widgets.Menus.Menu_Buttons is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu_Button; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu_Button; + + end Forge; diff --git a/src/fltk-widgets-menus.adb b/src/fltk-widgets-menus.adb index ddfc934..89bb584 100644 --- a/src/fltk-widgets-menus.adb +++ b/src/fltk-widgets-menus.adb @@ -101,25 +101,29 @@ package body FLTK.Widgets.Menus is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu is - begin - return This : Menu do - This.Void_Ptr := new_fl_menu - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu is + begin + return This : Menu do + This.Void_Ptr := new_fl_menu + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + menu_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + menu_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-menus.ads b/src/fltk-widgets-menus.ads index ddd8c51..ad9ce36 100644 --- a/src/fltk-widgets-menus.ads +++ b/src/fltk-widgets-menus.ads @@ -34,10 +34,14 @@ package FLTK.Widgets.Menus is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Menu; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Menu; + + end Forge; diff --git a/src/fltk-widgets-progress_bars.adb b/src/fltk-widgets-progress_bars.adb index 9f9cd06..70c07c6 100644 --- a/src/fltk-widgets-progress_bars.adb +++ b/src/fltk-widgets-progress_bars.adb @@ -98,25 +98,29 @@ package body FLTK.Widgets.Progress_Bars is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Progress_Bar is - begin - return This : Progress_Bar do - This.Void_Ptr := new_fl_progress - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - progress_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - progress_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Progress_Bar is + begin + return This : Progress_Bar do + This.Void_Ptr := new_fl_progress + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + progress_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + progress_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-progress_bars.ads b/src/fltk-widgets-progress_bars.ads index 252657b..007a28b 100644 --- a/src/fltk-widgets-progress_bars.ads +++ b/src/fltk-widgets-progress_bars.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Progress_Bars is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Progress_Bar; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Progress_Bar; + + end Forge; diff --git a/src/fltk-widgets-valuators-adjusters.adb b/src/fltk-widgets-valuators-adjusters.adb index 90495e6..569f6dd 100644 --- a/src/fltk-widgets-valuators-adjusters.adb +++ b/src/fltk-widgets-valuators-adjusters.adb @@ -79,25 +79,29 @@ package body FLTK.Widgets.Valuators.Adjusters is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Adjuster is - begin - return This : Adjuster do - This.Void_Ptr := new_fl_adjuster - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - adjuster_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - adjuster_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Adjuster is + begin + return This : Adjuster do + This.Void_Ptr := new_fl_adjuster + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + adjuster_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + adjuster_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-adjusters.ads b/src/fltk-widgets-valuators-adjusters.ads index 7ebeb0c..ee9e7ec 100644 --- a/src/fltk-widgets-valuators-adjusters.ads +++ b/src/fltk-widgets-valuators-adjusters.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Adjusters is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Adjuster; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Adjuster; + + end Forge; diff --git a/src/fltk-widgets-valuators-counters-simple.adb b/src/fltk-widgets-valuators-counters-simple.adb index 3b05cb0..eaaf5d9 100644 --- a/src/fltk-widgets-valuators-counters-simple.adb +++ b/src/fltk-widgets-valuators-counters-simple.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Counters.Simple is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Simple_Counter is - begin - return This : Simple_Counter do - This.Void_Ptr := new_fl_simple_counter - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - simple_counter_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - simple_counter_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Simple_Counter is + begin + return This : Simple_Counter do + This.Void_Ptr := new_fl_simple_counter + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + simple_counter_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + simple_counter_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-counters-simple.ads b/src/fltk-widgets-valuators-counters-simple.ads index 195db5a..f1ddeb4 100644 --- a/src/fltk-widgets-valuators-counters-simple.ads +++ b/src/fltk-widgets-valuators-counters-simple.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Counters.Simple is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Simple_Counter; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Simple_Counter; + + end Forge; diff --git a/src/fltk-widgets-valuators-counters.adb b/src/fltk-widgets-valuators-counters.adb index 811d2c0..fa98637 100644 --- a/src/fltk-widgets-valuators-counters.adb +++ b/src/fltk-widgets-valuators-counters.adb @@ -116,25 +116,29 @@ package body FLTK.Widgets.Valuators.Counters is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Counter is - begin - return This : Counter do - This.Void_Ptr := new_fl_counter - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - counter_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - counter_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Counter is + begin + return This : Counter do + This.Void_Ptr := new_fl_counter + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + counter_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + counter_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-counters.ads b/src/fltk-widgets-valuators-counters.ads index 1b07291..c7431d1 100644 --- a/src/fltk-widgets-valuators-counters.ads +++ b/src/fltk-widgets-valuators-counters.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Counters is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Counter; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Counter; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials-fill.adb b/src/fltk-widgets-valuators-dials-fill.adb index 97a915b..ae44c51 100644 --- a/src/fltk-widgets-valuators-dials-fill.adb +++ b/src/fltk-widgets-valuators-dials-fill.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Dials.Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Fill_Dial is - begin - return This : Fill_Dial do - This.Void_Ptr := new_fl_fill_dial - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - fill_dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - fill_dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Fill_Dial is + begin + return This : Fill_Dial do + This.Void_Ptr := new_fl_fill_dial + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + fill_dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + fill_dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials-fill.ads b/src/fltk-widgets-valuators-dials-fill.ads index ec01ac0..848a1a2 100644 --- a/src/fltk-widgets-valuators-dials-fill.ads +++ b/src/fltk-widgets-valuators-dials-fill.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Dials.Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Fill_Dial; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Fill_Dial; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials-line.adb b/src/fltk-widgets-valuators-dials-line.adb index 9892ba9..423f5c7 100644 --- a/src/fltk-widgets-valuators-dials-line.adb +++ b/src/fltk-widgets-valuators-dials-line.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Dials.Line is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Line_Dial is - begin - return This : Line_Dial do - This.Void_Ptr := new_fl_line_dial - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - line_dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - line_dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Line_Dial is + begin + return This : Line_Dial do + This.Void_Ptr := new_fl_line_dial + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + line_dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + line_dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials-line.ads b/src/fltk-widgets-valuators-dials-line.ads index 020647e..25b7778 100644 --- a/src/fltk-widgets-valuators-dials-line.ads +++ b/src/fltk-widgets-valuators-dials-line.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Dials.Line is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Line_Dial; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Line_Dial; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials.adb b/src/fltk-widgets-valuators-dials.adb index c66d655..46b2633 100644 --- a/src/fltk-widgets-valuators-dials.adb +++ b/src/fltk-widgets-valuators-dials.adb @@ -93,25 +93,29 @@ package body FLTK.Widgets.Valuators.Dials is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Dial is - begin - return This : Dial do - This.Void_Ptr := new_fl_dial - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Dial is + begin + return This : Dial do + This.Void_Ptr := new_fl_dial + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-dials.ads b/src/fltk-widgets-valuators-dials.ads index cb7d05d..cd22ec5 100644 --- a/src/fltk-widgets-valuators-dials.ads +++ b/src/fltk-widgets-valuators-dials.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Dials is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Dial; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Dial; + + end Forge; diff --git a/src/fltk-widgets-valuators-rollers.adb b/src/fltk-widgets-valuators-rollers.adb index 408a286..658bee7 100644 --- a/src/fltk-widgets-valuators-rollers.adb +++ b/src/fltk-widgets-valuators-rollers.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Rollers is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Roller is - begin - return This : Roller do - This.Void_Ptr := new_fl_roller - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - roller_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - roller_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Roller is + begin + return This : Roller do + This.Void_Ptr := new_fl_roller + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + roller_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + roller_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-rollers.ads b/src/fltk-widgets-valuators-rollers.ads index 22a60b4..8a6d045 100644 --- a/src/fltk-widgets-valuators-rollers.ads +++ b/src/fltk-widgets-valuators-rollers.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Rollers is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Roller; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Roller; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-fill.adb b/src/fltk-widgets-valuators-sliders-fill.adb index 94158fd..bdd47bf 100644 --- a/src/fltk-widgets-valuators-sliders-fill.adb +++ b/src/fltk-widgets-valuators-sliders-fill.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Sliders.Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Fill_Slider is - begin - return This : Fill_Slider do - This.Void_Ptr := new_fl_fill_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - fill_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - fill_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Fill_Slider is + begin + return This : Fill_Slider do + This.Void_Ptr := new_fl_fill_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + fill_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + fill_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-fill.ads b/src/fltk-widgets-valuators-sliders-fill.ads index 7bddf1a..cbf2856 100644 --- a/src/fltk-widgets-valuators-sliders-fill.ads +++ b/src/fltk-widgets-valuators-sliders-fill.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders.Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Fill_Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Fill_Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-hor_fill.adb b/src/fltk-widgets-valuators-sliders-hor_fill.adb index 7f520e8..2ce38d9 100644 --- a/src/fltk-widgets-valuators-sliders-hor_fill.adb +++ b/src/fltk-widgets-valuators-sliders-hor_fill.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Hor_Fill_Slider is - begin - return This : Hor_Fill_Slider do - This.Void_Ptr := new_fl_hor_fill_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - hor_fill_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - hor_fill_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Fill_Slider is + begin + return This : Hor_Fill_Slider do + This.Void_Ptr := new_fl_hor_fill_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + hor_fill_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + hor_fill_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-hor_fill.ads b/src/fltk-widgets-valuators-sliders-hor_fill.ads index db83cb4..fa30a68 100644 --- a/src/fltk-widgets-valuators-sliders-hor_fill.ads +++ b/src/fltk-widgets-valuators-sliders-hor_fill.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Fill is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Hor_Fill_Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Fill_Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-hor_nice.adb b/src/fltk-widgets-valuators-sliders-hor_nice.adb index 77b83bf..82801e8 100644 --- a/src/fltk-widgets-valuators-sliders-hor_nice.adb +++ b/src/fltk-widgets-valuators-sliders-hor_nice.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Sliders.Hor_Nice is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Hor_Nice_Slider is - begin - return This : Hor_Nice_Slider do - This.Void_Ptr := new_fl_hor_nice_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - hor_nice_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - hor_nice_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Nice_Slider is + begin + return This : Hor_Nice_Slider do + This.Void_Ptr := new_fl_hor_nice_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + hor_nice_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + hor_nice_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-hor_nice.ads b/src/fltk-widgets-valuators-sliders-hor_nice.ads index f86f53b..f5b48f7 100644 --- a/src/fltk-widgets-valuators-sliders-hor_nice.ads +++ b/src/fltk-widgets-valuators-sliders-hor_nice.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders.Hor_Nice is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Hor_Nice_Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Nice_Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-horizontal.adb b/src/fltk-widgets-valuators-sliders-horizontal.adb index b7bf946..bee5fc3 100644 --- a/src/fltk-widgets-valuators-sliders-horizontal.adb +++ b/src/fltk-widgets-valuators-sliders-horizontal.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Sliders.Horizontal is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Horizontal_Slider is - begin - return This : Horizontal_Slider do - This.Void_Ptr := new_fl_horizontal_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - horizontal_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - horizontal_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Horizontal_Slider is + begin + return This : Horizontal_Slider do + This.Void_Ptr := new_fl_horizontal_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + horizontal_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + horizontal_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-horizontal.ads b/src/fltk-widgets-valuators-sliders-horizontal.ads index 5804a59..0cb2d5b 100644 --- a/src/fltk-widgets-valuators-sliders-horizontal.ads +++ b/src/fltk-widgets-valuators-sliders-horizontal.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders.Horizontal is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Horizontal_Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Horizontal_Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-nice.adb b/src/fltk-widgets-valuators-sliders-nice.adb index 08efc8f..188103c 100644 --- a/src/fltk-widgets-valuators-sliders-nice.adb +++ b/src/fltk-widgets-valuators-sliders-nice.adb @@ -65,25 +65,29 @@ package body FLTK.Widgets.Valuators.Sliders.Nice is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Nice_Slider is - begin - return This : Nice_Slider do - This.Void_Ptr := new_fl_nice_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - nice_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - nice_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Nice_Slider is + begin + return This : Nice_Slider do + This.Void_Ptr := new_fl_nice_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + nice_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + nice_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders-nice.ads b/src/fltk-widgets-valuators-sliders-nice.ads index 3005f88..380887f 100644 --- a/src/fltk-widgets-valuators-sliders-nice.ads +++ b/src/fltk-widgets-valuators-sliders-nice.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders.Nice is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Nice_Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Nice_Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders.adb b/src/fltk-widgets-valuators-sliders.adb index a7392cf..1a8dbce 100644 --- a/src/fltk-widgets-valuators-sliders.adb +++ b/src/fltk-widgets-valuators-sliders.adb @@ -93,25 +93,29 @@ package body FLTK.Widgets.Valuators.Sliders is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Slider is - begin - return This : Slider do - This.Void_Ptr := new_fl_slider - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Slider is + begin + return This : Slider do + This.Void_Ptr := new_fl_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators-sliders.ads b/src/fltk-widgets-valuators-sliders.ads index 3760e53..48be83d 100644 --- a/src/fltk-widgets-valuators-sliders.ads +++ b/src/fltk-widgets-valuators-sliders.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators.Sliders is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Slider; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Slider; + + end Forge; diff --git a/src/fltk-widgets-valuators.adb b/src/fltk-widgets-valuators.adb index 4ef7edb..47c6f06 100644 --- a/src/fltk-widgets-valuators.adb +++ b/src/fltk-widgets-valuators.adb @@ -131,25 +131,29 @@ package body FLTK.Widgets.Valuators is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Valuator is - begin - return This : Valuator do - This.Void_Ptr := new_fl_valuator - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - valuator_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - valuator_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Valuator is + begin + return This : Valuator do + This.Void_Ptr := new_fl_valuator + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + valuator_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + valuator_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets-valuators.ads b/src/fltk-widgets-valuators.ads index ede5281..dafcfc3 100644 --- a/src/fltk-widgets-valuators.ads +++ b/src/fltk-widgets-valuators.ads @@ -8,10 +8,14 @@ package FLTK.Widgets.Valuators is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Valuator; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Valuator; + + end Forge; diff --git a/src/fltk-widgets.adb b/src/fltk-widgets.adb index deb0213..5d1e5d8 100644 --- a/src/fltk-widgets.adb +++ b/src/fltk-widgets.adb @@ -263,25 +263,29 @@ package body FLTK.Widgets is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Widget is - begin - return This : Widget do - This.Void_Ptr := new_fl_widget - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - widget_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - widget_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); - end return; - end Create; + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Widget is + begin + return This : Widget do + This.Void_Ptr := new_fl_widget + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + widget_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + widget_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; diff --git a/src/fltk-widgets.ads b/src/fltk-widgets.ads index 3cea435..e4069c1 100644 --- a/src/fltk-widgets.ads +++ b/src/fltk-widgets.ads @@ -26,10 +26,14 @@ package FLTK.Widgets is - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Widget; + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Widget; + + end Forge; |