From fb37523537cdb69a31dede401a604981ce8b7b9d Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sat, 17 Jun 2017 11:28:39 +1000 Subject: Updated coding style, added progress log --- src/fltk-widgets-groups-windows.ads | 39 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'src/fltk-widgets-groups-windows.ads') diff --git a/src/fltk-widgets-groups-windows.ads b/src/fltk-widgets-groups-windows.ads index d132cbf..9d1cefc 100644 --- a/src/fltk-widgets-groups-windows.ads +++ b/src/fltk-widgets-groups-windows.ads @@ -1,7 +1,12 @@ -with FLTK.Images.RGB; -private with Interfaces.C; +with + + FLTK.Images.RGB; + +private with + + Interfaces.C; package FLTK.Widgets.Groups.Windows is @@ -9,10 +14,8 @@ package FLTK.Widgets.Groups.Windows is type Window is new Group with private; - type Border_State is (None, Visible); - type Cursor is (Default, Arrow, Crosshair, Wait, Insert, Hand, Help, Move, @@ -21,98 +24,93 @@ package FLTK.Widgets.Groups.Windows is None); + + function Create (X, Y, W, H : in Integer; Text : in String) return Window; - function Create (W, H : in Integer) return Window; + + procedure Show (This : in out Window); - procedure Hide (This : in out Window); - procedure Make_Current (This : in out Window); + + function Get_Border (This : in Window) return Border_State; - procedure Set_Border (This : in out Window; To : in Border_State); - procedure Set_Label (This : in out Window; Text : in String); - procedure Set_Size_Range (This : in out Window; Min_W, Min_H : in Integer; Max_W, Max_H, Incre_W, Incre_H : in Integer := 0; Keep_Aspect : in Boolean := False); - procedure Set_Icon (This : in out Window; Pic : in out FLTK.Images.RGB.RGB_Image'Class); - procedure Set_Modal (This : in out Window); - procedure Set_Non_Modal (This : in out Window); - procedure Set_Cursor (This : in out Window; To : in Cursor); - procedure Set_Default_Cursor (This : in out Window; To : in Cursor); + + function Get_X_Root (This : in Window) return Integer; - function Get_Y_Root (This : in Window) return Integer; - function Get_Decorated_W (This : in Window) return Integer; - function Get_Decorated_H (This : in Window) return Integer; + + procedure Draw (This : in out Window); - function Handle (This : in out Window; Event : in Event_Kind) @@ -124,11 +122,12 @@ private type Window is new Group with null record; - overriding procedure Finalize (This : in out Window); + + -- What delightful magic numbers FLTK cursors are! -- (These correspond to the enum found in Enumerations.H) Cursor_Values : array (Cursor) of Interfaces.C.int := -- cgit