From edbb0173d98b170ef75eda0149a132b9836e239d Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Mon, 25 Nov 2024 16:17:52 +1300 Subject: Package renames for avoiding name clashes and abbreviations --- doc/common_dialogs.html | 266 ---------------- doc/fl_ask.html | 266 ++++++++++++++++ doc/fl_float_input.html | 4 +- doc/fl_hor_fill_slider.html | 12 +- doc/fl_hor_nice_slider.html | 12 +- doc/fl_int_input.html | 4 +- doc/index.html | 12 +- src/fltk-asks.adb | 345 +++++++++++++++++++++ src/fltk-asks.ads | 137 ++++++++ src/fltk-dialogs.adb | 345 --------------------- src/fltk-dialogs.ads | 137 -------- src/fltk-widgets-inputs-float.adb | 154 --------- src/fltk-widgets-inputs-float.ads | 72 ----- src/fltk-widgets-inputs-floating_point.adb | 154 +++++++++ src/fltk-widgets-inputs-floating_point.ads | 72 +++++ src/fltk-widgets-inputs-integer.adb | 152 --------- src/fltk-widgets-inputs-integer.ads | 72 ----- src/fltk-widgets-inputs-whole_number.adb | 152 +++++++++ src/fltk-widgets-inputs-whole_number.ads | 72 +++++ src/fltk-widgets-valuators-sliders-hor_fill.adb | 132 -------- src/fltk-widgets-valuators-sliders-hor_fill.ads | 63 ---- src/fltk-widgets-valuators-sliders-hor_nice.adb | 132 -------- src/fltk-widgets-valuators-sliders-hor_nice.ads | 63 ---- ...k-widgets-valuators-sliders-horizontal_fill.adb | 132 ++++++++ ...k-widgets-valuators-sliders-horizontal_fill.ads | 63 ++++ ...k-widgets-valuators-sliders-horizontal_nice.adb | 132 ++++++++ ...k-widgets-valuators-sliders-horizontal_nice.ads | 63 ++++ 27 files changed, 1610 insertions(+), 1610 deletions(-) delete mode 100644 doc/common_dialogs.html create mode 100644 doc/fl_ask.html create mode 100644 src/fltk-asks.adb create mode 100644 src/fltk-asks.ads delete mode 100644 src/fltk-dialogs.adb delete mode 100644 src/fltk-dialogs.ads delete mode 100644 src/fltk-widgets-inputs-float.adb delete mode 100644 src/fltk-widgets-inputs-float.ads create mode 100644 src/fltk-widgets-inputs-floating_point.adb create mode 100644 src/fltk-widgets-inputs-floating_point.ads delete mode 100644 src/fltk-widgets-inputs-integer.adb delete mode 100644 src/fltk-widgets-inputs-integer.ads create mode 100644 src/fltk-widgets-inputs-whole_number.adb create mode 100644 src/fltk-widgets-inputs-whole_number.ads delete mode 100644 src/fltk-widgets-valuators-sliders-hor_fill.adb delete mode 100644 src/fltk-widgets-valuators-sliders-hor_fill.ads delete mode 100644 src/fltk-widgets-valuators-sliders-hor_nice.adb delete mode 100644 src/fltk-widgets-valuators-sliders-hor_nice.ads create mode 100644 src/fltk-widgets-valuators-sliders-horizontal_fill.adb create mode 100644 src/fltk-widgets-valuators-sliders-horizontal_fill.ads create mode 100644 src/fltk-widgets-valuators-sliders-horizontal_nice.adb create mode 100644 src/fltk-widgets-valuators-sliders-horizontal_nice.ads diff --git a/doc/common_dialogs.html b/doc/common_dialogs.html deleted file mode 100644 index a35be43..0000000 --- a/doc/common_dialogs.html +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - Common Dialogs Binding Map - - - - - - -

Common Dialogs Binding Map

- - -Back to Index - - - - - - - - - - -
Package name
Fl_AskFLTK.Dialogs
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Types
Fl_BeepBeep_Kind
 Choice
 RGB_Float
 RGB_Int
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Functions and Procedures
-void fl_alert(const char *fmt,...);
-
-procedure Alert
-       (Message : String);
-
-int fl_ask(const char *fmt,...);
-
Present but disabled due to fl_ask being deprecated
-void fl_beep(int type);
-
-procedure Beep
-       (Kind : in Beep_Kind);
-
-int fl_choice(const char *fmt, const char *b0, const char *b1, const char *b2,...);
-
-function Three_Way_Choice
-       (Message, Button1, Button2, Button3 : in String)
-    return Choice;
-
-int fl_color_chooser(const char *name, double &r, double &g, double &b, int cmode);
-
-function Color_Chooser
-       (Title   : in     String;
-        R, G, B : in out RGB_Float;
-        Mode    : in     FLTK.Widgets.Groups.Color_Choosers.Color_Mode :=
-            FLTK.Widgets.Groups.Color_Choosers.RGB)
-    return Boolean;
-
-int fl_color_chooser(const char *name, uchar &r, uchar &g, uchar &b, int cmode);
-
-function Color_Chooser
-       (Title   : in     String;
-        R, G, B : in out RGB_Int;
-        Mode    : in     FLTK.Widgets.Groups.Color_Choosers.Color_Mode :=
-            FLTK.Widgets.Groups.Color_Choosers.RGB)
-    return Boolean;
-
-char * fl_dir_chooser(const char *message, const char *fname, int relative);
-
-function Dir_Chooser
-       (Message, Default : in String;
-        Relative         : in Boolean := False)
-    return String;
-
-char * fl_file_chooser(const char *message, const char *pat, const char *fname, int relative);
-
-function File_Chooser
-       (Message, Filter_Pattern, Default : in String;
-        Relative                         : in Boolean := False)
-    return String;
-
-void fl_file_chooser_callback(void(*cb)(const char *));
-
 
-void fl_file_chooser_ok_label(const char *l);
-
 
-const char * fl_input(const char *fmt, const char *defstr,...);
-
-function Text_Input
-       (Message : in String;
-        Default : in String := "")
-    return String;
-
-void fl_message(const char *fmt,...);
-
-procedure Message_Box
-       (Message : in String);
-
-void fl_message_font(Fl_Font f, Fl_Fontsize s);
-
-procedure Set_Message_Font
-       (Font : in Font_Kind;
-        Size : in Font_Size);
-
-void fl_message_hotspot(int enable);
-
-procedure Set_Hotspot
-       (To : in Boolean);
-
-int fl_message_hotspot(void);
-
-function Get_Hotspot
-    return Boolean;
-
-Fl_Widget * fl_message_icon();
-
-function Get_Message_Icon
-    return FLTK.Widgets.Boxes.Box_Reference;
-
-void fl_message_title(const char *title);
-
-procedure Set_Message_Title
-       (To : in String);
-
-void fl_message_title_default(const char *title);
-
-procedure Set_Message_Title_Default
-       (To : in String);
-
-const char * fl_password(const char *fmt, const char *defstr,...);
-
-function Password
-       (Message : in String;
-        Default : in String := "")
-    return String;
-
- - - - - diff --git a/doc/fl_ask.html b/doc/fl_ask.html new file mode 100644 index 0000000..4008514 --- /dev/null +++ b/doc/fl_ask.html @@ -0,0 +1,266 @@ + + + + + + + Fl_Ask Binding Map + + + + + + +

Fl_Ask Binding Map

+ + +Back to Index + + + + + + + + + + +
Package name
Fl_AskFLTK.Asks
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Types
Fl_BeepBeep_Kind
 Choice
 RGB_Float
 RGB_Int
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Functions and Procedures
+void fl_alert(const char *fmt,...);
+
+procedure Alert
+       (Message : String);
+
+int fl_ask(const char *fmt,...);
+
Present but disabled due to fl_ask being deprecated
+void fl_beep(int type);
+
+procedure Beep
+       (Kind : in Beep_Kind);
+
+int fl_choice(const char *fmt, const char *b0, const char *b1, const char *b2,...);
+
+function Three_Way_Choice
+       (Message, Button1, Button2, Button3 : in String)
+    return Choice;
+
+int fl_color_chooser(const char *name, double &r, double &g, double &b, int cmode);
+
+function Color_Chooser
+       (Title   : in     String;
+        R, G, B : in out RGB_Float;
+        Mode    : in     FLTK.Widgets.Groups.Color_Choosers.Color_Mode :=
+            FLTK.Widgets.Groups.Color_Choosers.RGB)
+    return Boolean;
+
+int fl_color_chooser(const char *name, uchar &r, uchar &g, uchar &b, int cmode);
+
+function Color_Chooser
+       (Title   : in     String;
+        R, G, B : in out RGB_Int;
+        Mode    : in     FLTK.Widgets.Groups.Color_Choosers.Color_Mode :=
+            FLTK.Widgets.Groups.Color_Choosers.RGB)
+    return Boolean;
+
+char * fl_dir_chooser(const char *message, const char *fname, int relative);
+
+function Dir_Chooser
+       (Message, Default : in String;
+        Relative         : in Boolean := False)
+    return String;
+
+char * fl_file_chooser(const char *message, const char *pat, const char *fname, int relative);
+
+function File_Chooser
+       (Message, Filter_Pattern, Default : in String;
+        Relative                         : in Boolean := False)
+    return String;
+
+void fl_file_chooser_callback(void(*cb)(const char *));
+
 
+void fl_file_chooser_ok_label(const char *l);
+
 
+const char * fl_input(const char *fmt, const char *defstr,...);
+
+function Text_Input
+       (Message : in String;
+        Default : in String := "")
+    return String;
+
+void fl_message(const char *fmt,...);
+
+procedure Message_Box
+       (Message : in String);
+
+void fl_message_font(Fl_Font f, Fl_Fontsize s);
+
+procedure Set_Message_Font
+       (Font : in Font_Kind;
+        Size : in Font_Size);
+
+void fl_message_hotspot(int enable);
+
+procedure Set_Hotspot
+       (To : in Boolean);
+
+int fl_message_hotspot(void);
+
+function Get_Hotspot
+    return Boolean;
+
+Fl_Widget * fl_message_icon();
+
+function Get_Message_Icon
+    return FLTK.Widgets.Boxes.Box_Reference;
+
+void fl_message_title(const char *title);
+
+procedure Set_Message_Title
+       (To : in String);
+
+void fl_message_title_default(const char *title);
+
+procedure Set_Message_Title_Default
+       (To : in String);
+
+const char * fl_password(const char *fmt, const char *defstr,...);
+
+function Password
+       (Message : in String;
+        Default : in String := "")
+    return String;
+
+ + + + + diff --git a/doc/fl_float_input.html b/doc/fl_float_input.html index 21189e9..c03dec4 100644 --- a/doc/fl_float_input.html +++ b/doc/fl_float_input.html @@ -22,7 +22,7 @@ Fl_Float_Input - FLTK.Widgets.Inputs.Float + FLTK.Widgets.Inputs.Floating_Point @@ -74,7 +74,7 @@ procedure Draw 
 function Get_Value
        (This : in Float_Input)
-    return Standard.Float;
+    return Long_Float;
diff --git a/doc/fl_hor_fill_slider.html b/doc/fl_hor_fill_slider.html index da8cba1..9805de5 100644 --- a/doc/fl_hor_fill_slider.html +++ b/doc/fl_hor_fill_slider.html @@ -22,7 +22,7 @@ Fl_Hor_Fill_Slider - FLTK.Widgets.Valuators.Sliders.Hor_Fill + FLTK.Widgets.Valuators.Sliders.Horizontal_Fill @@ -34,12 +34,12 @@ Fl_Hor_Fill_Slider - Hor_Fill_Slider + Horizontal_Fill_Slider   - Hor_Fill_Slider_Reference + Horizontal_Fill_Slider_Reference @@ -57,7 +57,7 @@ Fl_Hor_Fill_Slider(int X, int Y, int W, int H, const char *L=0); function Create (X, Y, W, H : in Integer; Text : in String) - return Hor_Fill_Slider; + return Horizontal_Fill_Slider; @@ -65,7 +65,7 @@ function Create   
 procedure Draw
-       (This : in out Hor_Fill_Slider);
+       (This : in out Horizontal_Fill_Slider);
@@ -73,7 +73,7 @@ procedure Draw   
 function Handle
-       (This  : in out Hor_Fill_Slider;
+       (This  : in out Horizontal_Fill_Slider;
         Event : in     Event_Kind)
     return Event_Outcome;
diff --git a/doc/fl_hor_nice_slider.html b/doc/fl_hor_nice_slider.html index aa597be..5cbc4e0 100644 --- a/doc/fl_hor_nice_slider.html +++ b/doc/fl_hor_nice_slider.html @@ -22,7 +22,7 @@ Fl_Hor_Nice_Slider - FLTK.Widgets.Valuators.Sliders.Hor_Nice + FLTK.Widgets.Valuators.Sliders.Horizontal_Nice @@ -34,12 +34,12 @@ Fl_Hor_Nice_Slider - Hor_Nice_Slider + Horizontal_Nice_Slider   - Hor_Nice_Slider_Reference + Horizontal_Nice_Slider_Reference @@ -57,7 +57,7 @@ Fl_Hor_Nice_Slider(int X, int Y, int W, int H, const char *L=0); function Create (X, Y, W, H : in Integer; Text : in String) - return Hor_Nice_Slider; + return Horizontal_Nice_Slider; @@ -65,7 +65,7 @@ function Create   
 procedure Draw
-       (This : in out Hor_Nice_Slider);
+       (This : in out Horizontal_Nice_Slider);
@@ -73,7 +73,7 @@ procedure Draw   
 function Handle
-       (This  : in out Hor_Nice_Slider;
+       (This  : in out Horizontal_Nice_Slider;
         Event : in     Event_Kind)
     return Event_Outcome;
diff --git a/doc/fl_int_input.html b/doc/fl_int_input.html index 841d818..a900620 100644 --- a/doc/fl_int_input.html +++ b/doc/fl_int_input.html @@ -22,7 +22,7 @@ Fl_Int_Input - FLTK.Widgets.Inputs.Integer + FLTK.Widgets.Inputs.Whole_Number @@ -74,7 +74,7 @@ procedure Draw 
 function Get_Value
        (This : in Integer_Input)
-    return Standard.Integer;
+    return Long_Integer;
diff --git a/doc/index.html b/doc/index.html index 49e17b1..335bd70 100644 --- a/doc/index.html +++ b/doc/index.html @@ -20,7 +20,7 @@
  • Enumerations
  • Fl
  • Fl_Adjuster
    • -
  • Fl_Ask
    • +
  • Fl_Ask
  • Fl_Bitmap
  • Fl_BMP_Image
  • Fl_Box
    • @@ -136,6 +136,7 @@