From f5f77c762534ed15adc557009d1a645e5fd998a5 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Sat, 16 Nov 2024 10:30:34 +1300 Subject: Reworked widget init/create subprograms --- src/fltk-widgets-valuators-value_inputs.ads | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/fltk-widgets-valuators-value_inputs.ads') diff --git a/src/fltk-widgets-valuators-value_inputs.ads b/src/fltk-widgets-valuators-value_inputs.ads index 663a88d..8c45026 100644 --- a/src/fltk-widgets-valuators-value_inputs.ads +++ b/src/fltk-widgets-valuators-value_inputs.ads @@ -33,7 +33,7 @@ package FLTK.Widgets.Valuators.Value_Inputs is function Input - (This : in Value_Input) + (This : in out Value_Input) return FLTK.Widgets.Inputs.Input_Reference; @@ -111,37 +111,30 @@ package FLTK.Widgets.Valuators.Value_Inputs is private - package INP renames FLTK.Widgets.Inputs; - - - type Input_Access is access INP.Input; - - type Value_Input is new Valuator with record - My_Input : Input_Access; + My_Input : aliased Inputs.Input; end record; overriding procedure Finalize (This : in out Value_Input); - + procedure Extra_Init + (This : in out Value_Input; + X, Y, W, H : in Integer; + Text : in String); pragma Inline (Input); - pragma Inline (Get_Cursor_Color); pragma Inline (Set_Cursor_Color); - pragma Inline (Get_Shortcut); pragma Inline (Set_Shortcut); - pragma Inline (Is_Soft); pragma Inline (Set_Soft); - pragma Inline (Get_Text_Color); pragma Inline (Set_Text_Color); pragma Inline (Get_Text_Font); @@ -149,7 +142,6 @@ private pragma Inline (Get_Text_Size); pragma Inline (Set_Text_Size); - pragma Inline (Draw); pragma Inline (Handle); -- cgit