diff options
| author | Jed Barber <jjbarber@y7mail.com> | 2016-05-26 00:38:43 +1000 |
|---|---|---|
| committer | Jed Barber <jjbarber@y7mail.com> | 2016-05-26 00:38:43 +1000 |
| commit | 524edbb4463b66d61e92c92a7020d9d09b82e744 (patch) | |
| tree | b2ec49fdcc88a34c4c2f80ead9548358a382da77 | |
| parent | ed6fcd873aad9e574de0b2c6311d1c4404cb76dc (diff) | |
The Great Package Naming Style Change(tm)
53 files changed, 643 insertions, 635 deletions
diff --git a/src/adapad.adb b/src/adapad.adb index 271b77d..63ad67f 100644 --- a/src/adapad.adb +++ b/src/adapad.adb @@ -1,19 +1,27 @@ -- with Editor; -with FLTK.Widget.Group.Window.Double; -with FLTK.Widget.Box; -with FLTK.Widget.Group.Text_Display; +with FLTK.Widgets.Groups.Windows.Double; +with FLTK.Widgets.Boxes; +with FLTK.Widgets.Buttons.Enter; +with FLTK.Widgets.Buttons.Light.Check; +with FLTK.Widgets.Buttons.Light.Radio; +with FLTK.Widgets.Buttons.Light.Round.Radio; +with FLTK.Widgets.Buttons.Radio; +with FLTK.Widgets.Buttons.Repeat; +with FLTK.Widgets.Buttons.Toggle; +with FLTK.Widgets.Inputs; +with FLTK.Widgets.Groups.Text_Displays; with FLTK.Enums; use FLTK.Enums; function AdaPad return Integer is - package Dbl renames FLTK.Widget.Group.Window.Double; - package Box renames FLTK.Widget.Box; + package Dbl renames FLTK.Widgets.Groups.Windows.Double; + package Bx renames FLTK.Widgets.Boxes; - W : Dbl.Double_Type := Dbl.Create (340, 180); - B : Box.Box_Type := Box.Create (20, 40, 300, 100, "Test"); + W : Dbl.Double_Window := Dbl.Create (340, 180); + B : Bx.Box := Bx.Create (20, 40, 300, 100, "Test"); begin diff --git a/src/editor.ads b/src/editor.ads deleted file mode 100644 index e80111a..0000000 --- a/src/editor.ads +++ /dev/null @@ -1,41 +0,0 @@ - - -with FLTK.Widget.Group.Window.Double; -with FLTK.Widget.Input; -with FLTK.Widget.Button.Ret; - - -package Editor is - - - package Window renames FLTK.Widget.Group.Window; - - type Editor_Type is new Window.Double.Double_Type with private; - - - function Create - (X, Y, W, H : in Integer; - Label : in String) - return Editor_Type; - - -private - - - type Editor_Type is new Window.Double.Double_Type with - record - Replace_Dialog : Window.Window_Type; - Replace_Find : FLTK.Widget.Input.Input_Type; - Replace_With : FLTK.Widget.Input.Input_Type; - Replace_All : FLTK.Widget.Button.Button_Type; - Replace_Next : FLTK.Widget.Button.Ret.Return_Type; - Replace_Cancel : FLTK.Widget.Button.Button_Type; - end record; - - - overriding procedure Initialize (This : in out Editor_Type); - overriding procedure Finalize (This : in out Editor_Type); - - -end Editor; - diff --git a/src/editors.ads b/src/editors.ads new file mode 100644 index 0000000..27d54d7 --- /dev/null +++ b/src/editors.ads @@ -0,0 +1,41 @@ + + +with FLTK.Widgets.Groups.Windows.Double; +with FLTK.Widgets.Inputs; +with FLTK.Widgets.Buttons.Enter; + + +package Editors is + + + package Windows renames FLTK.Widgets.Groups.Windows; + + type Editor is new Windows.Double.Double_Window with private; + + + function Create + (X, Y, W, H : in Integer; + Label : in String) + return Editor; + + +private + + + type Editor is new Windows.Double.Double_Window with + record + Replace_Dialog : Windows.Window; + Replace_Find : FLTK.Widgets.Inputs.Input; + Replace_With : FLTK.Widgets.Inputs.Input; + Replace_All : FLTK.Widgets.Buttons.Button; + Replace_Next : FLTK.Widgets.Buttons.Enter.Enter_Button; + Replace_Cancel : FLTK.Widgets.Buttons.Button; + end record; + + + overriding procedure Initialize (This : in out Editor); + overriding procedure Finalize (This : in out Editor); + + +end Editors; + diff --git a/src/fltk_binding/fltk-widget-box.ads b/src/fltk_binding/fltk-widget-box.ads deleted file mode 100644 index 2ce03e7..0000000 --- a/src/fltk_binding/fltk-widget-box.ads +++ /dev/null @@ -1,22 +0,0 @@ - - -package FLTK.Widget.Box is - - - type Box_Type is new Widget_Type with private; - - - function Create (X, Y, W, H : Integer; Label : String) return Box_Type; - - -private - - - type Box_Type is new Widget_Type with null record; - - - overriding procedure Finalize (This : in out Box_Type); - - -end FLTK.Widget.Box; - diff --git a/src/fltk_binding/fltk-widget-button-light-check.ads b/src/fltk_binding/fltk-widget-button-light-check.ads deleted file mode 100644 index 14eab60..0000000 --- a/src/fltk_binding/fltk-widget-button-light-check.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Light.Check is - - - type Check_Type is new Light_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Check_Type; - - -private - - - type Check_Type is new Light_Type with null record; - - - overriding procedure Finalize (This : in out Check_Type); - - -end FLTK.Widget.Button.Light.Check; - diff --git a/src/fltk_binding/fltk-widget-button-light-radio.ads b/src/fltk_binding/fltk-widget-button-light-radio.ads deleted file mode 100644 index bf78d65..0000000 --- a/src/fltk_binding/fltk-widget-button-light-radio.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Light.Radio is - - - type Radio_Type is new Light_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Radio_Type; - - -private - - - type Radio_Type is new Light_Type with null record; - - - overriding procedure Finalize (This : in out Radio_Type); - - -end FLTK.Widget.Button.Light.Radio; - diff --git a/src/fltk_binding/fltk-widget-button-light-round-radio.ads b/src/fltk_binding/fltk-widget-button-light-round-radio.ads deleted file mode 100644 index c0e4f38..0000000 --- a/src/fltk_binding/fltk-widget-button-light-round-radio.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Light.Round.Radio is - - - type Radio_Type is new Round_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Radio_Type; - - -private - - - type Radio_Type is new Round_Type with null record; - - - overriding procedure Finalize (This : in out Radio_Type); - - -end FLTK.Widget.Button.Light.Round.Radio; - diff --git a/src/fltk_binding/fltk-widget-button-light-round.ads b/src/fltk_binding/fltk-widget-button-light-round.ads deleted file mode 100644 index e440b1a..0000000 --- a/src/fltk_binding/fltk-widget-button-light-round.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Light.Round is - - - type Round_Type is new Light_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Round_Type; - - -private - - - type Round_Type is new Light_Type with null record; - - - overriding procedure Finalize (This : in out Round_Type); - - -end FLTK.Widget.Button.Light.Round; - diff --git a/src/fltk_binding/fltk-widget-button-light.ads b/src/fltk_binding/fltk-widget-button-light.ads deleted file mode 100644 index bbc2c9e..0000000 --- a/src/fltk_binding/fltk-widget-button-light.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Light is - - - type Light_Type is new Button_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Light_Type; - - -private - - - type Light_Type is new Button_Type with null record; - - - overriding procedure Finalize (This : in out Light_Type); - - -end FLTK.Widget.Button.Light; - diff --git a/src/fltk_binding/fltk-widget-button-radio.ads b/src/fltk_binding/fltk-widget-button-radio.ads deleted file mode 100644 index 2c36c77..0000000 --- a/src/fltk_binding/fltk-widget-button-radio.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Radio is - - - type Radio_Type is new Button_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Radio_Type; - - -private - - - type Radio_Type is new Button_Type with null record; - - - overriding procedure Finalize (This : in out Radio_Type); - - -end FLTK.Widget.Button.Radio; - diff --git a/src/fltk_binding/fltk-widget-button-repeat.ads b/src/fltk_binding/fltk-widget-button-repeat.ads deleted file mode 100644 index d7cd383..0000000 --- a/src/fltk_binding/fltk-widget-button-repeat.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Repeat is - - - type Repeat_Type is new Button_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Repeat_Type; - - -private - - - type Repeat_Type is new Button_Type with null record; - - - overriding procedure Finalize (This : in out Repeat_Type); - - -end FLTK.Widget.Button.Repeat; - diff --git a/src/fltk_binding/fltk-widget-button-ret.ads b/src/fltk_binding/fltk-widget-button-ret.ads deleted file mode 100644 index ed0da3c..0000000 --- a/src/fltk_binding/fltk-widget-button-ret.ads +++ /dev/null @@ -1,26 +0,0 @@ - - --- FLTK.Widget.Button.Return, but return is a reserved word -package FLTK.Widget.Button.Ret is - - - type Return_Type is new Button_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Return_Type; - - -private - - - type Return_Type is new Button_Type with null record; - - - overriding procedure Finalize (This : in out Return_Type); - - -end FLTK.Widget.Button.Ret; - diff --git a/src/fltk_binding/fltk-widget-button-toggle.ads b/src/fltk_binding/fltk-widget-button-toggle.ads deleted file mode 100644 index e9d185e..0000000 --- a/src/fltk_binding/fltk-widget-button-toggle.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Button.Toggle is - - - type Toggle_Type is new Button_Type with private; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Toggle_Type; - - -private - - - type Toggle_Type is new Button_Type with null record; - - - overriding procedure Finalize (This : in out Toggle_Type); - - -end FLTK.Widget.Button.Toggle; - diff --git a/src/fltk_binding/fltk-widget-button.ads b/src/fltk_binding/fltk-widget-button.ads deleted file mode 100644 index 14762bf..0000000 --- a/src/fltk_binding/fltk-widget-button.ads +++ /dev/null @@ -1,40 +0,0 @@ - - -package FLTK.Widget.Button is - - - type Button_Type is new Widget_Type with private; - type State is (On, Off); - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Button_Type; - - - function Get_State - (B : in Button_Type'Class) - return State; - - - procedure Set_State - (B : in Button_Type'Class; - S : in State); - - - procedure Set_Only - (B : in Button_Type'Class); - - -private - - - type Button_Type is new Widget_Type with null record; - - - overriding procedure Finalize (This : in out Button_Type); - - -end FLTK.Widget.Button; - diff --git a/src/fltk_binding/fltk-widget-group-text_display.ads b/src/fltk_binding/fltk-widget-group-text_display.ads deleted file mode 100644 index adbbeb4..0000000 --- a/src/fltk_binding/fltk-widget-group-text_display.ads +++ /dev/null @@ -1,58 +0,0 @@ - - -with FLTK.Enums; use FLTK.Enums; - - -package FLTK.Widget.Group.Text_Display is - - - type Text_Display_Type is new Group_Type with private; - - - function Create - (X, Y, W, H : in Integer; - Label : in String) - return Text_Display_Type; - - - function Get_Text_Color - (TD : in Text_Display_Type) - return Color; - - - procedure Set_Text_Color - (TD : in Text_Display_Type; - C : in Color); - - - function Get_Text_Font - (TD : in Text_Display_Type) - return Font_Kind; - - - procedure Set_Text_Font - (TD : in Text_Display_Type; - F : in Font_Kind); - - - function Get_Text_Size - (TD : in Text_Display_Type) - return Font_Size; - - - procedure Set_Text_Size - (TD : in Text_Display_Type; - S : in Font_Size); - - -private - - - type Text_Display_Type is new Group_Type with null record; - - - overriding procedure Finalize (This : in out Text_Display_Type); - - -end FLTK.Widget.Group.Text_Display; - diff --git a/src/fltk_binding/fltk-widget-group-window-double.ads b/src/fltk_binding/fltk-widget-group-window-double.ads deleted file mode 100644 index 687b876..0000000 --- a/src/fltk_binding/fltk-widget-group-window-double.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Group.Window.Double is - - - type Double_Type is new Window_Type with private; - - - function Create (X, Y, W, H : Integer; Label : String) return Double_Type; - function Create (W, H : in Integer) return Double_Type; - - procedure Show (W : in Double_Type); - - -private - - - type Double_Type is new Window_Type with null record; - - - overriding procedure Finalize (This : in out Double_Type); - - -end FLTK.Widget.Group.Window.Double; - diff --git a/src/fltk_binding/fltk-widget-group-window.ads b/src/fltk_binding/fltk-widget-group-window.ads deleted file mode 100644 index 6d4a32d..0000000 --- a/src/fltk_binding/fltk-widget-group-window.ads +++ /dev/null @@ -1,25 +0,0 @@ - - -package FLTK.Widget.Group.Window is - - - type Window_Type is new Group_Type with private; - - - function Create (X, Y, W, H : Integer; Label : String) return Window_Type; - function Create (W, H : in Integer) return Window_Type; - - procedure Show (W : in Window_Type); - - -private - - - type Window_Type is new Group_Type with null record; - - - overriding procedure Finalize (This : in out Window_Type); - - -end FLTK.Widget.Group.Window; - diff --git a/src/fltk_binding/fltk-widget-group.ads b/src/fltk_binding/fltk-widget-group.ads deleted file mode 100644 index d71f76c..0000000 --- a/src/fltk_binding/fltk-widget-group.ads +++ /dev/null @@ -1,57 +0,0 @@ - - -package FLTK.Widget.Group is - - - type Group_Type is new Widget_Type with private; - type Index is new Integer; - - - function Create - (X, Y, W, H : Integer; - Label : String) - return Group_Type; - - - procedure Add - (This : Group_Type'Class; - Item : Widget_Type'Class); - - - procedure Clear - (This : Group_Type'Class); - - - function Find - (This : Group_Type'Class; - Item : Widget_Type'Class) - return Index; - - - procedure Insert - (This : Group_Type'Class; - Item : Widget_Type'Class; - Place : Index); - - - procedure Remove - (This : Group_Type'Class; - Item : Widget_Type'Class); - - - procedure Remove - (This : Group_Type'Class; - Place : Index); - - -private - - - type Group_Type is new Widget_Type with null record; - - - overriding procedure Finalize (This : in out Group_Type); - - -end FLTK.Widget.Group; - diff --git a/src/fltk_binding/fltk-widget-input.ads b/src/fltk_binding/fltk-widget-input.ads deleted file mode 100644 index c537aef..0000000 --- a/src/fltk_binding/fltk-widget-input.ads +++ /dev/null @@ -1,22 +0,0 @@ - - -package FLTK.Widget.Input is - - - type Input_Type is new Widget_Type with private; - - - function Create (X, Y, W, H : Integer; Label : String) return Input_Type; - - -private - - - type Input_Type is new Widget_Type with null record; - - - overriding procedure Finalize (This : in out Input_Type); - - -end FLTK.Widget.Input; - diff --git a/src/fltk_binding/fltk-widget-box.adb b/src/fltk_binding/fltk-widgets-boxes.adb index 8aa18cb..a176c30 100644 --- a/src/fltk_binding/fltk-widget-box.adb +++ b/src/fltk_binding/fltk-widgets-boxes.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Box is +package body FLTK.Widgets.Boxes is function new_fl_box @@ -20,7 +20,7 @@ package body FLTK.Widget.Box is - procedure Finalize (This : in out Box_Type) is + procedure Finalize (This : in out Box) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_box (This.Void_Ptr); @@ -33,7 +33,7 @@ package body FLTK.Widget.Box is function Create (X, Y, W, H : Integer; Label : String) - return Box_Type is + return Box is VP : System.Address; @@ -50,5 +50,5 @@ package body FLTK.Widget.Box is end Create; -end FLTK.Widget.Box; +end FLTK.Widgets.Boxes; diff --git a/src/fltk_binding/fltk-widgets-boxes.ads b/src/fltk_binding/fltk-widgets-boxes.ads new file mode 100644 index 0000000..4b27e1e --- /dev/null +++ b/src/fltk_binding/fltk-widgets-boxes.ads @@ -0,0 +1,22 @@ + + +package FLTK.Widgets.Boxes is + + + type Box is new Widget with private; + + + function Create (X, Y, W, H : Integer; Label : String) return Box; + + +private + + + type Box is new Widget with null record; + + + overriding procedure Finalize (This : in out Box); + + +end FLTK.Widgets.Boxes; + diff --git a/src/fltk_binding/fltk-widget-button-ret.adb b/src/fltk_binding/fltk-widgets-buttons-enter.adb index 8f68341..89b6c2f 100644 --- a/src/fltk_binding/fltk-widget-button-ret.adb +++ b/src/fltk_binding/fltk-widgets-buttons-enter.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Ret is +package body FLTK.Widgets.Buttons.Enter is function new_fl_return_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Ret is - procedure Finalize (This : in out Return_Type) is + procedure Finalize (This : in out Enter_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_return_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Ret is function Create (X, Y, W, H : Integer; Label : String) - return Return_Type is + return Enter_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Ret is end Create; -end FLTK.Widget.Button.Ret; +end FLTK.Widgets.Buttons.Enter; diff --git a/src/fltk_binding/fltk-widgets-buttons-enter.ads b/src/fltk_binding/fltk-widgets-buttons-enter.ads new file mode 100644 index 0000000..8649130 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-enter.ads @@ -0,0 +1,26 @@ + + +-- Return Buttons, but return is a reserved word, so it's Enter Buttons instead +package FLTK.Widgets.Buttons.Enter is + + + type Enter_Button is new Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Enter_Button; + + +private + + + type Enter_Button is new Button with null record; + + + overriding procedure Finalize (This : in out Enter_Button); + + +end FLTK.Widgets.Buttons.Enter; + diff --git a/src/fltk_binding/fltk-widget-button-light-check.adb b/src/fltk_binding/fltk-widgets-buttons-light-check.adb index 0be477e..319db9f 100644 --- a/src/fltk_binding/fltk-widget-button-light-check.adb +++ b/src/fltk_binding/fltk-widgets-buttons-light-check.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Light.Check is +package body FLTK.Widgets.Buttons.Light.Check is function new_fl_check_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Light.Check is - procedure Finalize (This : in out Check_Type) is + procedure Finalize (This : in out Check_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_check_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Light.Check is function Create (X, Y, W, H : Integer; Label : String) - return Check_Type is + return Check_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Light.Check is end Create; -end FLTK.Widget.Button.Light.Check; +end FLTK.Widgets.Buttons.Light.Check; diff --git a/src/fltk_binding/fltk-widgets-buttons-light-check.ads b/src/fltk_binding/fltk-widgets-buttons-light-check.ads new file mode 100644 index 0000000..77ac0e6 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-light-check.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Light.Check is + + + type Check_Button is new Light_Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Check_Button; + + +private + + + type Check_Button is new Light_Button with null record; + + + overriding procedure Finalize (This : in out Check_Button); + + +end FLTK.Widgets.Buttons.Light.Check; + diff --git a/src/fltk_binding/fltk-widget-button-light-radio.adb b/src/fltk_binding/fltk-widgets-buttons-light-radio.adb index d3a5e48..779b612 100644 --- a/src/fltk_binding/fltk-widget-button-light-radio.adb +++ b/src/fltk_binding/fltk-widgets-buttons-light-radio.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Light.Radio is +package body FLTK.Widgets.Buttons.Light.Radio is function new_fl_radio_light_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Light.Radio is - procedure Finalize (This : in out Radio_Type) is + procedure Finalize (This : in out Radio_Light_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_radio_light_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Light.Radio is function Create (X, Y, W, H : Integer; Label : String) - return Radio_Type is + return Radio_Light_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Light.Radio is end Create; -end FLTK.Widget.Button.Light.Radio; +end FLTK.Widgets.Buttons.Light.Radio; diff --git a/src/fltk_binding/fltk-widgets-buttons-light-radio.ads b/src/fltk_binding/fltk-widgets-buttons-light-radio.ads new file mode 100644 index 0000000..2fef2ab --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-light-radio.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Light.Radio is + + + type Radio_Light_Button is new Light_Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Radio_Light_Button; + + +private + + + type Radio_Light_Button is new Light_Button with null record; + + + overriding procedure Finalize (This : in out Radio_Light_Button); + + +end FLTK.Widgets.Buttons.Light.Radio; + diff --git a/src/fltk_binding/fltk-widget-button-light-round-radio.adb b/src/fltk_binding/fltk-widgets-buttons-light-round-radio.adb index d3a857d..5852581 100644 --- a/src/fltk_binding/fltk-widget-button-light-round-radio.adb +++ b/src/fltk_binding/fltk-widgets-buttons-light-round-radio.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Light.Round.Radio is +package body FLTK.Widgets.Buttons.Light.Round.Radio is function new_fl_radio_round_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Light.Round.Radio is - procedure Finalize (This : in out Radio_Type) is + procedure Finalize (This : in out Radio_Round_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_radio_round_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Light.Round.Radio is function Create (X, Y, W, H : Integer; Label : String) - return Radio_Type is + return Radio_Round_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Light.Round.Radio is end Create; -end FLTK.Widget.Button.Light.Round.Radio; +end FLTK.Widgets.Buttons.Light.Round.Radio; diff --git a/src/fltk_binding/fltk-widgets-buttons-light-round-radio.ads b/src/fltk_binding/fltk-widgets-buttons-light-round-radio.ads new file mode 100644 index 0000000..666f944 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-light-round-radio.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Light.Round.Radio is + + + type Radio_Round_Button is new Round_Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Radio_Round_Button; + + +private + + + type Radio_Round_Button is new Round_Button with null record; + + + overriding procedure Finalize (This : in out Radio_Round_Button); + + +end FLTK.Widgets.Buttons.Light.Round.Radio; + diff --git a/src/fltk_binding/fltk-widget-button-light-round.adb b/src/fltk_binding/fltk-widgets-buttons-light-round.adb index bda70f4..a9510ab 100644 --- a/src/fltk_binding/fltk-widget-button-light-round.adb +++ b/src/fltk_binding/fltk-widgets-buttons-light-round.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Light.Round is +package body FLTK.Widgets.Buttons.Light.Round is function new_fl_round_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Light.Round is - procedure Finalize (This : in out Round_Type) is + procedure Finalize (This : in out Round_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_round_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Light.Round is function Create (X, Y, W, H : Integer; Label : String) - return Round_Type is + return Round_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Light.Round is end Create; -end FLTK.Widget.Button.Light.Round; +end FLTK.Widgets.Buttons.Light.Round; diff --git a/src/fltk_binding/fltk-widgets-buttons-light-round.ads b/src/fltk_binding/fltk-widgets-buttons-light-round.ads new file mode 100644 index 0000000..18d72d0 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-light-round.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Light.Round is + + + type Round_Button is new Light_Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Round_Button; + + +private + + + type Round_Button is new Light_Button with null record; + + + overriding procedure Finalize (This : in out Round_Button); + + +end FLTK.Widgets.Buttons.Light.Round; + diff --git a/src/fltk_binding/fltk-widget-button-light.adb b/src/fltk_binding/fltk-widgets-buttons-light.adb index 6f76890..f31f3a9 100644 --- a/src/fltk_binding/fltk-widget-button-light.adb +++ b/src/fltk_binding/fltk-widgets-buttons-light.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Light is +package body FLTK.Widgets.Buttons.Light is function new_fl_light_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Light is - procedure Finalize (This : in out Light_Type) is + procedure Finalize (This : in out Light_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_light_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Light is function Create (X, Y, W, H : Integer; Label : String) - return Light_Type is + return Light_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Light is end Create; -end FLTK.Widget.Button.Light; +end FLTK.Widgets.Buttons.Light; diff --git a/src/fltk_binding/fltk-widgets-buttons-light.ads b/src/fltk_binding/fltk-widgets-buttons-light.ads new file mode 100644 index 0000000..d0c733d --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-light.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Light is + + + type Light_Button is new Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Light_Button; + + +private + + + type Light_Button is new Button with null record; + + + overriding procedure Finalize (This : in out Light_Button); + + +end FLTK.Widgets.Buttons.Light; + diff --git a/src/fltk_binding/fltk-widget-button-radio.adb b/src/fltk_binding/fltk-widgets-buttons-radio.adb index 4af17e4..cd8d1ce 100644 --- a/src/fltk_binding/fltk-widget-button-radio.adb +++ b/src/fltk_binding/fltk-widgets-buttons-radio.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Radio is +package body FLTK.Widgets.Buttons.Radio is function new_fl_radio_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Radio is - procedure Finalize (This : in out Radio_Type) is + procedure Finalize (This : in out Radio_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_radio_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Radio is function Create (X, Y, W, H : Integer; Label : String) - return Radio_Type is + return Radio_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Radio is end Create; -end FLTK.Widget.Button.Radio; +end FLTK.Widgets.Buttons.Radio; diff --git a/src/fltk_binding/fltk-widgets-buttons-radio.ads b/src/fltk_binding/fltk-widgets-buttons-radio.ads new file mode 100644 index 0000000..3681e05 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-radio.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Radio is + + + type Radio_Button is new Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Radio_Button; + + +private + + + type Radio_Button is new Button with null record; + + + overriding procedure Finalize (This : in out Radio_Button); + + +end FLTK.Widgets.Buttons.Radio; + diff --git a/src/fltk_binding/fltk-widget-button-repeat.adb b/src/fltk_binding/fltk-widgets-buttons-repeat.adb index 3bdc52b..66e3e3d 100644 --- a/src/fltk_binding/fltk-widget-button-repeat.adb +++ b/src/fltk_binding/fltk-widgets-buttons-repeat.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Repeat is +package body FLTK.Widgets.Buttons.Repeat is function new_fl_repeat_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Repeat is - procedure Finalize (This : in out Repeat_Type) is + procedure Finalize (This : in out Repeat_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_repeat_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Repeat is function Create (X, Y, W, H : Integer; Label : String) - return Repeat_Type is + return Repeat_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Repeat is end Create; -end FLTK.Widget.Button.Repeat; +end FLTK.Widgets.Buttons.Repeat; diff --git a/src/fltk_binding/fltk-widgets-buttons-repeat.ads b/src/fltk_binding/fltk-widgets-buttons-repeat.ads new file mode 100644 index 0000000..277a783 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-repeat.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Repeat is + + + type Repeat_Button is new Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Repeat_Button; + + +private + + + type Repeat_Button is new Button with null record; + + + overriding procedure Finalize (This : in out Repeat_Button); + + +end FLTK.Widgets.Buttons.Repeat; + diff --git a/src/fltk_binding/fltk-widget-button-toggle.adb b/src/fltk_binding/fltk-widgets-buttons-toggle.adb index 3bd692c..1347845 100644 --- a/src/fltk_binding/fltk-widget-button-toggle.adb +++ b/src/fltk_binding/fltk-widgets-buttons-toggle.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button.Toggle is +package body FLTK.Widgets.Buttons.Toggle is function new_fl_toggle_button @@ -21,7 +21,7 @@ package body FLTK.Widget.Button.Toggle is - procedure Finalize (This : in out Toggle_Type) is + procedure Finalize (This : in out Toggle_Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_toggle_button (This.Void_Ptr); @@ -34,7 +34,7 @@ package body FLTK.Widget.Button.Toggle is function Create (X, Y, W, H : Integer; Label : String) - return Toggle_Type is + return Toggle_Button is VP : System.Address; @@ -49,5 +49,5 @@ package body FLTK.Widget.Button.Toggle is end Create; -end FLTK.Widget.Button.Toggle; +end FLTK.Widgets.Buttons.Toggle; diff --git a/src/fltk_binding/fltk-widgets-buttons-toggle.ads b/src/fltk_binding/fltk-widgets-buttons-toggle.ads new file mode 100644 index 0000000..7f99872 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons-toggle.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Buttons.Toggle is + + + type Toggle_Button is new Button with private; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Toggle_Button; + + +private + + + type Toggle_Button is new Button with null record; + + + overriding procedure Finalize (This : in out Toggle_Button); + + +end FLTK.Widgets.Buttons.Toggle; + diff --git a/src/fltk_binding/fltk-widget-button.adb b/src/fltk_binding/fltk-widgets-buttons.adb index 238e761..504c73f 100644 --- a/src/fltk_binding/fltk-widget-button.adb +++ b/src/fltk_binding/fltk-widgets-buttons.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Button is +package body FLTK.Widgets.Buttons is function new_fl_button @@ -35,7 +35,7 @@ package body FLTK.Widget.Button is - procedure Finalize (This : in out Button_Type) is + procedure Finalize (This : in out Button) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_button (This.Void_Ptr); @@ -48,7 +48,7 @@ package body FLTK.Widget.Button is function Create (X, Y, W, H : Integer; Label : String) - return Button_Type is + return Button is VP : System.Address; @@ -66,7 +66,7 @@ package body FLTK.Widget.Button is function Get_State - (B : in Button_Type'Class) + (B : in Button'Class) return State is begin return State'Val (fl_button_get_state (B.Void_Ptr)); @@ -76,7 +76,7 @@ package body FLTK.Widget.Button is procedure Set_State - (B : in Button_Type'Class; + (B : in Button'Class; S : in State) is begin fl_button_set_state (B.Void_Ptr, State'Pos (S)); @@ -86,11 +86,11 @@ package body FLTK.Widget.Button is procedure Set_Only - (B : in Button_Type'Class) is + (B : in Button'Class) is begin fl_button_set_only (B.Void_Ptr); end Set_Only; -end FLTK.Widget.Button; +end FLTK.Widgets.Buttons; diff --git a/src/fltk_binding/fltk-widgets-buttons.ads b/src/fltk_binding/fltk-widgets-buttons.ads new file mode 100644 index 0000000..63329b8 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-buttons.ads @@ -0,0 +1,40 @@ + + +package FLTK.Widgets.Buttons is + + + type Button is new Widget with private; + type State is (On, Off); + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Button; + + + function Get_State + (B : in Button'Class) + return State; + + + procedure Set_State + (B : in Button'Class; + S : in State); + + + procedure Set_Only + (B : in Button'Class); + + +private + + + type Button is new Widget with null record; + + + overriding procedure Finalize (This : in out Button); + + +end FLTK.Widgets.Buttons; + diff --git a/src/fltk_binding/fltk-widget-group-text_display.adb b/src/fltk_binding/fltk-widgets-groups-text_displays.adb index e558d9a..8d08fbb 100644 --- a/src/fltk_binding/fltk-widget-group-text_display.adb +++ b/src/fltk_binding/fltk-widgets-groups-text_displays.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Group.Text_Display is +package body FLTK.Widgets.Groups.Text_Displays is function new_fl_text_display @@ -58,7 +58,7 @@ package body FLTK.Widget.Group.Text_Display is - procedure Finalize (This : in out Text_Display_Type) is + procedure Finalize (This : in out Text_Display) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_text_display (This.Void_Ptr); @@ -71,7 +71,7 @@ package body FLTK.Widget.Group.Text_Display is function Create (X, Y, W, H : in Integer; Label : in String) - return Text_Display_Type is + return Text_Display is VP : System.Address; @@ -90,7 +90,7 @@ package body FLTK.Widget.Group.Text_Display is function Get_Text_Color - (TD : in Text_Display_Type) + (TD : in Text_Display) return Color is begin return Color (fl_text_display_get_text_color (TD.Void_Ptr)); @@ -100,7 +100,7 @@ package body FLTK.Widget.Group.Text_Display is procedure Set_Text_Color - (TD : in Text_Display_Type; + (TD : in Text_Display; C : in Color) is begin fl_text_display_set_text_color (TD.Void_Ptr, Interfaces.C.int (C)); @@ -110,7 +110,7 @@ package body FLTK.Widget.Group.Text_Display is function Get_Text_Font - (TD : in Text_Display_Type) + (TD : in Text_Display) return Font_Kind is begin return Font_Kind'Val (fl_text_display_get_text_font (TD.Void_Ptr)); @@ -120,7 +120,7 @@ package body FLTK.Widget.Group.Text_Display is procedure Set_Text_Font - (TD : in Text_Display_Type; + (TD : in Text_Display; F : in Font_Kind) is begin fl_text_display_set_text_font (TD.Void_Ptr, Font_Kind'Pos (F)); @@ -130,7 +130,7 @@ package body FLTK.Widget.Group.Text_Display is function Get_Text_Size - (TD : in Text_Display_Type) + (TD : in Text_Display) return Font_Size is begin return Font_Size (fl_text_display_get_text_size (TD.Void_Ptr)); @@ -140,12 +140,12 @@ package body FLTK.Widget.Group.Text_Display is procedure Set_Text_Size - (TD : in Text_Display_Type; + (TD : in Text_Display; S : in Font_Size) is begin fl_text_display_set_text_size (TD.Void_Ptr, Interfaces.C.int (S)); end Set_Text_Size; -end FLTK.Widget.Group.Text_Display; +end FLTK.Widgets.Groups.Text_Displays; diff --git a/src/fltk_binding/fltk-widgets-groups-text_displays.ads b/src/fltk_binding/fltk-widgets-groups-text_displays.ads new file mode 100644 index 0000000..e5391d1 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-groups-text_displays.ads @@ -0,0 +1,58 @@ + + +with FLTK.Enums; use FLTK.Enums; + + +package FLTK.Widgets.Groups.Text_Displays is + + + type Text_Display is new Group with private; + + + function Create + (X, Y, W, H : in Integer; + Label : in String) + return Text_Display; + + + function Get_Text_Color + (TD : in Text_Display) + return Color; + + + procedure Set_Text_Color + (TD : in Text_Display; + C : in Color); + + + function Get_Text_Font + (TD : in Text_Display) + return Font_Kind; + + + procedure Set_Text_Font + (TD : in Text_Display; + F : in Font_Kind); + + + function Get_Text_Size + (TD : in Text_Display) + return Font_Size; + + + procedure Set_Text_Size + (TD : in Text_Display; + S : in Font_Size); + + +private + + + type Text_Display is new Group with null record; + + + overriding procedure Finalize (This : in out Text_Display); + + +end FLTK.Widgets.Groups.Text_Displays; + diff --git a/src/fltk_binding/fltk-widget-group-window-double.adb b/src/fltk_binding/fltk-widgets-groups-windows-double.adb index 1e678f3..4d46d7e 100644 --- a/src/fltk_binding/fltk-widget-group-window-double.adb +++ b/src/fltk_binding/fltk-widgets-groups-windows-double.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Group.Window.Double is +package body FLTK.Widgets.Groups.Windows.Double is function new_fl_double_window @@ -36,7 +36,7 @@ package body FLTK.Widget.Group.Window.Double is - procedure Finalize (This : in out Double_Type) is + procedure Finalize (This : in out Double_Window) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_double_window (This.Void_Ptr); @@ -49,7 +49,7 @@ package body FLTK.Widget.Group.Window.Double is function Create (X, Y, W, H : Integer; Label : String) - return Double_Type is + return Double_Window is VP : System.Address; @@ -69,7 +69,7 @@ package body FLTK.Widget.Group.Window.Double is function Create (W, H : in Integer) - return Double_Type is + return Double_Window is VP : System.Address; @@ -85,11 +85,11 @@ package body FLTK.Widget.Group.Window.Double is procedure Show - (W : in Double_Type) is + (W : in Double_Window) is begin fl_double_window_show (W.Void_Ptr); end Show; -end FLTK.Widget.Group.Window.Double; +end FLTK.Widgets.Groups.Windows.Double; diff --git a/src/fltk_binding/fltk-widgets-groups-windows-double.ads b/src/fltk_binding/fltk-widgets-groups-windows-double.ads new file mode 100644 index 0000000..6876508 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-groups-windows-double.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Groups.Windows.Double is + + + type Double_Window is new Window with private; + + + function Create (X, Y, W, H : Integer; Label : String) return Double_Window; + function Create (W, H : in Integer) return Double_Window; + + procedure Show (W : in Double_Window); + + +private + + + type Double_Window is new Window with null record; + + + overriding procedure Finalize (This : in out Double_Window); + + +end FLTK.Widgets.Groups.Windows.Double; + diff --git a/src/fltk_binding/fltk-widget-group-window.adb b/src/fltk_binding/fltk-widgets-groups-windows.adb index 1007d71..c304521 100644 --- a/src/fltk_binding/fltk-widget-group-window.adb +++ b/src/fltk_binding/fltk-widgets-groups-windows.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Group.Window is +package body FLTK.Widgets.Groups.Windows is function new_fl_window @@ -32,7 +32,7 @@ package body FLTK.Widget.Group.Window is - procedure Finalize (This : in out Window_Type) is + procedure Finalize (This : in out Window) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_window (This.Void_Ptr); @@ -45,7 +45,7 @@ package body FLTK.Widget.Group.Window is function Create (X, Y, W, H : Integer; Label : String) - return Window_Type is + return Window is VP : System.Address; @@ -65,7 +65,7 @@ package body FLTK.Widget.Group.Window is - function Create (W, H : in Integer) return Window_Type is + function Create (W, H : in Integer) return Window is VP : System.Address; begin VP := new_fl_window2 (Interfaces.C.int (W), Interfaces.C.int (H)); @@ -76,11 +76,11 @@ package body FLTK.Widget.Group.Window is - procedure Show (W : in Window_Type) is + procedure Show (W : in Window) is begin fl_window_show (W.Void_Ptr); end Show; -end FLTK.Widget.Group.Window; +end FLTK.Widgets.Groups.Windows; diff --git a/src/fltk_binding/fltk-widgets-groups-windows.ads b/src/fltk_binding/fltk-widgets-groups-windows.ads new file mode 100644 index 0000000..69d2df4 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-groups-windows.ads @@ -0,0 +1,25 @@ + + +package FLTK.Widgets.Groups.Windows is + + + type Window is new Group with private; + + + function Create (X, Y, W, H : Integer; Label : String) return Window; + function Create (W, H : in Integer) return Window; + + procedure Show (W : in Window); + + +private + + + type Window is new Group with null record; + + + overriding procedure Finalize (This : in out Window); + + +end FLTK.Widgets.Groups.Windows; + diff --git a/src/fltk_binding/fltk-widget-group.adb b/src/fltk_binding/fltk-widgets-groups.adb index 76414b7..b3322b7 100644 --- a/src/fltk_binding/fltk-widget-group.adb +++ b/src/fltk_binding/fltk-widgets-groups.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Group is +package body FLTK.Widgets.Groups is function new_fl_group @@ -52,7 +52,7 @@ package body FLTK.Widget.Group is - procedure Finalize (This : in out Group_Type) is + procedure Finalize (This : in out Group) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_group (This.Void_Ptr); @@ -65,7 +65,7 @@ package body FLTK.Widget.Group is function Create (X, Y, W, H : in Integer; Label : in String) - return Group_Type is + return Group is VP : System.Address; @@ -84,8 +84,8 @@ package body FLTK.Widget.Group is procedure Add - (This : Group_Type'Class; - Item : Widget_Type'Class) is + (This : Group'Class; + Item : Widget'Class) is begin fl_group_add (This.Void_Ptr, Item.Void_Ptr); end Add; @@ -94,7 +94,7 @@ package body FLTK.Widget.Group is procedure Clear - (This : Group_Type'Class) is + (This : Group'Class) is begin fl_group_clear (This.Void_Ptr); end Clear; @@ -103,8 +103,8 @@ package body FLTK.Widget.Group is function Find - (This : Group_Type'Class; - Item : Widget_Type'Class) + (This : Group'Class; + Item : Widget'Class) return Index is begin return Index (fl_group_find (This.Void_Ptr, Item.Void_Ptr)); @@ -114,8 +114,8 @@ package body FLTK.Widget.Group is procedure Insert - (This : Group_Type'Class; - Item : Widget_Type'Class; + (This : Group'Class; + Item : Widget'Class; Place : Index) is begin fl_group_insert @@ -128,8 +128,8 @@ package body FLTK.Widget.Group is procedure Remove - (This : Group_Type'Class; - Item : Widget_Type'Class) is + (This : Group'Class; + Item : Widget'Class) is begin fl_group_remove (This.Void_Ptr, Item.Void_Ptr); end Remove; @@ -138,12 +138,12 @@ package body FLTK.Widget.Group is procedure Remove - (This : Group_Type'Class; + (This : Group'Class; Place : Index) is begin fl_group_remove2 (This.Void_Ptr, Interfaces.C.int (Place)); end Remove; -end FLTK.Widget.Group; +end FLTK.Widgets.Groups; diff --git a/src/fltk_binding/fltk-widgets-groups.ads b/src/fltk_binding/fltk-widgets-groups.ads new file mode 100644 index 0000000..bf4891f --- /dev/null +++ b/src/fltk_binding/fltk-widgets-groups.ads @@ -0,0 +1,57 @@ + + +package FLTK.Widgets.Groups is + + + type Group is new Widget with private; + type Index is new Integer; + + + function Create + (X, Y, W, H : Integer; + Label : String) + return Group; + + + procedure Add + (This : Group'Class; + Item : Widget'Class); + + + procedure Clear + (This : Group'Class); + + + function Find + (This : Group'Class; + Item : Widget'Class) + return Index; + + + procedure Insert + (This : Group'Class; + Item : Widget'Class; + Place : Index); + + + procedure Remove + (This : Group'Class; + Item : Widget'Class); + + + procedure Remove + (This : Group'Class; + Place : Index); + + +private + + + type Group is new Widget with null record; + + + overriding procedure Finalize (This : in out Group); + + +end FLTK.Widgets.Groups; + diff --git a/src/fltk_binding/fltk-widget-input.adb b/src/fltk_binding/fltk-widgets-inputs.adb index 2428dde..436ef36 100644 --- a/src/fltk_binding/fltk-widget-input.adb +++ b/src/fltk_binding/fltk-widgets-inputs.adb @@ -5,7 +5,7 @@ with System; use type System.Address; -package body FLTK.Widget.Input is +package body FLTK.Widgets.Inputs is function new_fl_input @@ -20,7 +20,7 @@ package body FLTK.Widget.Input is - procedure Finalize (This : in out Input_Type) is + procedure Finalize (This : in out Input) is begin if (This.Void_Ptr /= System.Null_Address) then free_fl_input (This.Void_Ptr); @@ -30,7 +30,7 @@ package body FLTK.Widget.Input is - function Create (X, Y, W, H : Integer; Label : String) return Input_Type is + function Create (X, Y, W, H : Integer; Label : String) return Input is VP : System.Address; begin VP := new_fl_input @@ -43,5 +43,5 @@ package body FLTK.Widget.Input is end Create; -end FLTK.Widget.Input; +end FLTK.Widgets.Inputs; diff --git a/src/fltk_binding/fltk-widgets-inputs.ads b/src/fltk_binding/fltk-widgets-inputs.ads new file mode 100644 index 0000000..e0661f1 --- /dev/null +++ b/src/fltk_binding/fltk-widgets-inputs.ads @@ -0,0 +1,22 @@ + + +package FLTK.Widgets.Inputs is + + + type Input is new Widget with private; + + + function Create (X, Y, W, H : Integer; Label : String) return Input; + + +private + + + type Input is new Widget with null record; + + + overriding procedure Finalize (This : in out Input); + + +end FLTK.Widgets.Inputs; + diff --git a/src/fltk_binding/fltk-widget.adb b/src/fltk_binding/fltk-widgets.adb index a19969f..cd91841 100644 --- a/src/fltk_binding/fltk-widget.adb +++ b/src/fltk_binding/fltk-widgets.adb @@ -4,7 +4,7 @@ with Interfaces.C; with System; -package body FLTK.Widget is +package body FLTK.Widgets is function fl_widget_get_box @@ -50,7 +50,7 @@ package body FLTK.Widget is - procedure Initialize (This : in out Widget_Type) is + procedure Initialize (This : in out Widget) is begin This.Void_Ptr := System.Null_Address; end Initialize; @@ -59,7 +59,7 @@ package body FLTK.Widget is function Get_Box - (W : in Widget_Type'Class) + (W : in Widget'Class) return Box_Kind is begin return Box_Kind'Val (fl_widget_get_box (W.Void_Ptr)); @@ -69,7 +69,7 @@ package body FLTK.Widget is procedure Set_Box - (W : in Widget_Type'Class; + (W : in Widget'Class; B : in Box_Kind) is begin fl_widget_set_box (W.Void_Ptr, Box_Kind'Pos (B)); @@ -79,7 +79,7 @@ package body FLTK.Widget is function Get_Label_Font - (W : in Widget_Type'Class) + (W : in Widget'Class) return Font_Kind is begin return Font_Kind'Val (fl_widget_get_label_font (W.Void_Ptr)); @@ -89,7 +89,7 @@ package body FLTK.Widget is procedure Set_Label_Font - (W : in Widget_Type'Class; + (W : in Widget'Class; F : in Font_Kind) is begin fl_widget_set_label_font (W.Void_Ptr, Font_Kind'Pos (F)); @@ -99,7 +99,7 @@ package body FLTK.Widget is function Get_Label_Size - (W : in Widget_Type'Class) + (W : in Widget'Class) return Font_Size is begin return Font_Size (fl_widget_get_label_size (W.Void_Ptr)); @@ -109,7 +109,7 @@ package body FLTK.Widget is procedure Set_Label_Size - (W : in Widget_Type'Class; + (W : in Widget'Class; S : in Font_Size) is begin fl_widget_set_label_size (W.Void_Ptr, Interfaces.C.int (S)); @@ -119,7 +119,7 @@ package body FLTK.Widget is function Get_Label_Type - (W : in Widget_Type'Class) + (W : in Widget'Class) return Label_Kind is begin return Label_Kind'Val (fl_widget_get_label_type (W.Void_Ptr)); @@ -129,12 +129,12 @@ package body FLTK.Widget is procedure Set_Label_Type - (W : in Widget_Type'Class; + (W : in Widget'Class; L : in Label_Kind) is begin fl_widget_set_label_type (W.Void_Ptr, Label_Kind'Pos (L)); end Set_Label_Type; -end FLTK.Widget; +end FLTK.Widgets; diff --git a/src/fltk_binding/fltk-widget.ads b/src/fltk_binding/fltk-widgets.ads index ef4650e..3cbef76 100644 --- a/src/fltk_binding/fltk-widget.ads +++ b/src/fltk_binding/fltk-widgets.ads @@ -5,10 +5,10 @@ with Ada.Finalization; private with System; -package FLTK.Widget is +package FLTK.Widgets is - type Widget_Type is abstract new Ada.Finalization.Limited_Controlled with private; + type Widget is abstract new Ada.Finalization.Limited_Controlled with private; type Font_Size is new Natural; @@ -21,60 +21,60 @@ package FLTK.Widget is function Create (X, Y, W, H : in Integer; Label : in String) - return Widget_Type is abstract; + return Widget is abstract; function Get_Box - (W : in Widget_Type'Class) + (W : in Widget'Class) return Box_Kind; procedure Set_Box - (W : in Widget_Type'Class; + (W : in Widget'Class; B : in Box_Kind); function Get_Label_Font - (W : in Widget_Type'Class) + (W : in Widget'Class) return Font_Kind; procedure Set_Label_Font - (W : in Widget_Type'Class; + (W : in Widget'Class; F : in Font_Kind); function Get_Label_Size - (W : in Widget_Type'Class) + (W : in Widget'Class) return Font_Size; procedure Set_Label_Size - (W : in Widget_Type'Class; + (W : in Widget'Class; S : in Font_Size); function Get_Label_Type - (W : in Widget_Type'Class) + (W : in Widget'Class) return Label_Kind; procedure Set_Label_Type - (W : in Widget_Type'Class; + (W : in Widget'Class; L : in Label_Kind); private - type Widget_Type is abstract new Ada.Finalization.Limited_Controlled with + type Widget is abstract new Ada.Finalization.Limited_Controlled with record Void_Ptr : System.Address; end record; - overriding procedure Initialize (This : in out Widget_Type); + overriding procedure Initialize (This : in out Widget); -end FLTK.Widget; +end FLTK.Widgets; |