FLTK.Draw minor backstage cleanup

2 files changed, 107 insertions, 24 deletions

diff --git a/src/fltk-draw.adb b/src/fltk-draw.adb
index fecca4c..74dccb8 100644
--- a/src/fltk-draw.adb
+++ b/src/fltk-draw.adb
@@ -637,6 +637,10 @@ package body FLTK.Draw is
 
 
 
+    --------------------------
+    --  Charset Conversion  --
+    --------------------------
+
     function Latin1_To_Local
            (From : in String)
         return String is
@@ -675,6 +679,10 @@ package body FLTK.Draw is
 
 
 
+    ----------------
+    --  Clipping  --
+    ----------------
+
     function Clip_Box
            (X, Y, W, H     : in     Integer;
             BX, BY, BW, BH :    out Integer)
@@ -739,6 +747,10 @@ package body FLTK.Draw is
 
 
 
+    ---------------
+    --  Overlay  --
+    ---------------
+
     procedure Overlay_Clear is
     begin
         fl_draw_overlay_clear;
@@ -758,6 +770,10 @@ package body FLTK.Draw is
 
 
 
+    ----------------
+    --  Settings  --
+    ----------------
+
     function Get_Color
         return Color is
     begin
@@ -861,6 +877,10 @@ package body FLTK.Draw is
 
 
 
+    -------------------------
+    --  Matrix Operations  --
+    -------------------------
+
     procedure Mult_Matrix
            (A, B, C, D, X, Y : in Long_Float) is
     begin
@@ -978,6 +998,10 @@ package body FLTK.Draw is
 
 
 
+    -----------------------
+    --  Special Drawing  --
+    -----------------------
+
     procedure Add_Symbol
            (Text     : in String;
             Callback : in Symbol_Draw_Function;
@@ -1260,6 +1284,10 @@ package body FLTK.Draw is
 
 
 
+    ----------------------
+    --  Manual Drawing  --
+    ----------------------
+
     procedure Begin_Complex_Polygon is
     begin
         fl_draw_begin_complex_polygon;
@@ -1286,8 +1314,6 @@ package body FLTK.Draw is
     end Begin_Polygon;
 
 
-
-
     procedure Arc
            (X, Y, R, Start, Finish : in Long_Float) is
     begin
@@ -1532,17 +1558,17 @@ package body FLTK.Draw is
     end Rect_Fill;
 
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1 : in Integer) is
     begin
         fl_draw_xy_line
            (Interfaces.C.int (X0),
             Interfaces.C.int (Y0),
             Interfaces.C.int (X1));
-    end XY_Line;
+    end Ecks_Why_Line;
 
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1, Y2 : in Integer) is
     begin
         fl_draw_xy_line2
@@ -1550,10 +1576,10 @@ package body FLTK.Draw is
             Interfaces.C.int (Y0),
             Interfaces.C.int (X1),
             Interfaces.C.int (Y2));
-    end XY_Line;
+    end Ecks_Why_Line;
 
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1, Y2, X3 : in Integer) is
     begin
         fl_draw_xy_line3
@@ -1562,20 +1588,20 @@ package body FLTK.Draw is
             Interfaces.C.int (X1),
             Interfaces.C.int (Y2),
             Interfaces.C.int (X3));
-    end XY_Line;
+    end Ecks_Why_Line;
 
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1 : in Integer) is
     begin
         fl_draw_yx_line
            (Interfaces.C.int (X0),
             Interfaces.C.int (Y0),
             Interfaces.C.int (Y1));
-    end YX_Line;
+    end Why_Ecks_Line;
 
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1, X2 : in Integer) is
     begin
         fl_draw_yx_line2
@@ -1583,10 +1609,10 @@ package body FLTK.Draw is
             Interfaces.C.int (Y0),
             Interfaces.C.int (Y1),
             Interfaces.C.int (X2));
-    end YX_Line;
+    end Why_Ecks_Line;
 
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1, X2, Y3 : in Integer) is
     begin
         fl_draw_yx_line3
@@ -1595,9 +1621,7 @@ package body FLTK.Draw is
             Interfaces.C.int (Y1),
             Interfaces.C.int (X2),
             Interfaces.C.int (Y3));
-    end YX_Line;
-
-
+    end Why_Ecks_Line;
 
 
     procedure End_Complex_Polygon is
diff --git a/src/fltk-draw.ads b/src/fltk-draw.ads
index 32ee90b..e287f90 100644
--- a/src/fltk-draw.ads
+++ b/src/fltk-draw.ads
@@ -435,22 +435,22 @@ package FLTK.Draw is
            (X, Y, W, H : in Integer;
             R, G, B    : in Color_Component);
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1 : in Integer);
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1, Y2 : in Integer);
 
-    procedure XY_Line
+    procedure Ecks_Why_Line
            (X0, Y0, X1, Y2, X3 : in Integer);
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1 : in Integer);
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1, X2 : in Integer);
 
-    procedure YX_Line
+    procedure Why_Ecks_Line
            (X0, Y0, Y1, X2, Y3 : in Integer);
 
     procedure End_Complex_Polygon;
@@ -466,16 +466,65 @@ private
     pragma Convention (C, Symbol_Draw_Function);
 
 
+    pragma Inline (Reset_Spot);
+    pragma Inline (Set_Spot);
+    pragma Inline (Set_Status);
+
+
     pragma Inline (Can_Do_Alpha_Blending);
+    pragma Inline (Shortcut_Label);
+
+
+    pragma Inline (Latin1_To_Local);
+    pragma Inline (Local_To_Latin1);
+    pragma Inline (Mac_Roman_To_Local);
+    pragma Inline (Local_To_Mac_Roman);
+
+
+    pragma Inline (Clip_Intersects);
+    pragma Inline (Pop_Clip);
+    pragma Inline (Push_Clip);
+    pragma Inline (Push_No_Clip);
+    pragma Inline (Restore_Clip);
+
+
+    pragma Inline (Overlay_Clear);
+    pragma Inline (Overlay_Rect);
 
 
     pragma Inline (Get_Color);
     pragma Inline (Set_Color);
     pragma Inline (Get_Font);
+    pragma Inline (Get_Font_Size);
     pragma Inline (Set_Font);
-
-
+    pragma Inline (Font_Line_Spacing);
+    pragma Inline (Font_Descent);
+    pragma Inline (Font_Height);
+
+
+    pragma Inline (Mult_Matrix);
+    pragma Inline (Pop_Matrix);
+    pragma Inline (Push_Matrix);
+    pragma Inline (Rotate);
+    pragma Inline (Scale);
+    pragma Inline (Transform_DX);
+    pragma Inline (Transform_DY);
+    pragma Inline (Transform_X);
+    pragma Inline (Transform_Y);
+    pragma Inline (Transformed_Vertex);
+    pragma Inline (Translate);
+    pragma Inline (Vertex);
+
+
+    pragma Inline (Add_Symbol);
+    pragma Inline (Draw_Text);
+    pragma Inline (Draw_Text_Right_Left);
     pragma Inline (Draw_Box);
+    pragma Inline (Draw_Symbol);
+    pragma Inline (Measure);
+    pragma Inline (Scroll);
+    pragma Inline (Text_Extents);
+    pragma Inline (Width);
 
 
     pragma Inline (Begin_Complex_Polygon);
@@ -486,10 +535,20 @@ private
 
 
     pragma Inline (Arc);
+    pragma Inline (Chord);
     pragma Inline (Circle);
+    pragma Inline (Curve);
     pragma Inline (Frame);
     pragma Inline (Gap);
     pragma Inline (Line);
+    pragma Inline (Outline);
+    pragma Inline (Pie);
+    pragma Inline (Point);
+    pragma Inline (Polygon);
+    pragma Inline (Rect);
+    pragma Inline (Rect_Fill);
+    pragma Inline (Ecks_Why_Line);
+    pragma Inline (Why_Ecks_Line);
 
 
     pragma Inline (End_Complex_Polygon);