Removed superfluous Get_Value calls on the CPP side

8 files changed, 12 insertions, 37 deletions

diff --git a/src/c_fl_float_input.cpp b/src/c_fl_float_input.cpp
index d8812c7..1331e3c 100644
--- a/src/c_fl_float_input.cpp
+++ b/src/c_fl_float_input.cpp
@@ -55,9 +55,3 @@ void free_fl_float_input(FLOAT_INPUT i) {
 }
 
 
-
-
-const char * fl_float_input_get_value(FLOAT_INPUT i) {
-    return reinterpret_cast<Fl_Float_Input*>(i)->value();
-}
-
diff --git a/src/c_fl_float_input.h b/src/c_fl_float_input.h
index 187a176..ed71bac 100644
--- a/src/c_fl_float_input.h
+++ b/src/c_fl_float_input.h
@@ -14,8 +14,5 @@ extern "C" FLOAT_INPUT new_fl_float_input(int x, int y, int w, int h, char* labe
 extern "C" void free_fl_float_input(FLOAT_INPUT i);
 
 
-extern "C" const char * fl_float_input_get_value(FLOAT_INPUT i);
-
-
 #endif
 
diff --git a/src/c_fl_int_input.cpp b/src/c_fl_int_input.cpp
index a15d1fb..cf038c7 100644
--- a/src/c_fl_int_input.cpp
+++ b/src/c_fl_int_input.cpp
@@ -55,9 +55,3 @@ void free_fl_int_input(INT_INPUT i) {
 }
 
 
-
-
-const char * fl_int_input_get_value(INT_INPUT i) {
-    return reinterpret_cast<Fl_Int_Input*>(i)->value();
-}
-
diff --git a/src/c_fl_int_input.h b/src/c_fl_int_input.h
index 7bfd74d..125ed18 100644
--- a/src/c_fl_int_input.h
+++ b/src/c_fl_int_input.h
@@ -14,8 +14,5 @@ extern "C" INT_INPUT new_fl_int_input(int x, int y, int w, int h, char* label);
 extern "C" void free_fl_int_input(INT_INPUT i);
 
 
-extern "C" const char * fl_int_input_get_value(INT_INPUT i);
-
-
 #endif
 
diff --git a/src/fltk-widgets-inputs-float.adb b/src/fltk-widgets-inputs-float.adb
index 2287140..4769c8a 100644
--- a/src/fltk-widgets-inputs-float.adb
+++ b/src/fltk-widgets-inputs-float.adb
@@ -26,11 +26,6 @@ package body FLTK.Widgets.Inputs.Float is
            (F : in System.Address);
     pragma Import (C, free_fl_float_input, "free_fl_float_input");
 
-    function fl_float_input_get_value
-           (F : in System.Address)
-        return Interfaces.C.Strings.chars_ptr;
-    pragma Import (C, fl_float_input_get_value, "fl_float_input_get_value");
-
 
 
 
@@ -102,8 +97,7 @@ package body FLTK.Widgets.Inputs.Float is
         return Standard.Float is
     begin
         return Standard.Float'Value
-               (Interfaces.C.Strings.Value
-                       (fl_float_input_get_value (This.Void_Ptr)));
+               (Interfaces.C.Strings.Value (fl_input_get_value (This.Void_Ptr)));
     end Get_Value;
 
 
diff --git a/src/fltk-widgets-inputs-integer.adb b/src/fltk-widgets-inputs-integer.adb
index 0f2c711..9234f60 100644
--- a/src/fltk-widgets-inputs-integer.adb
+++ b/src/fltk-widgets-inputs-integer.adb
@@ -26,11 +26,6 @@ package body FLTK.Widgets.Inputs.Integer is
            (F : in System.Address);
     pragma Import (C, free_fl_int_input, "free_fl_int_input");
 
-    function fl_int_input_get_value
-           (F : in System.Address)
-        return Interfaces.C.Strings.chars_ptr;
-    pragma Import (C, fl_int_input_get_value, "fl_int_input_get_value");
-
 
 
 
@@ -102,8 +97,7 @@ package body FLTK.Widgets.Inputs.Integer is
         return Standard.Integer is
     begin
         return Standard.Integer'Value
-               (Interfaces.C.Strings.Value
-                       (fl_int_input_get_value (This.Void_Ptr)));
+               (Interfaces.C.Strings.Value (fl_input_get_value (This.Void_Ptr)));
     end Get_Value;
 
 
diff --git a/src/fltk-widgets-inputs.adb b/src/fltk-widgets-inputs.adb
index 9cf7a74..322c51e 100644
--- a/src/fltk-widgets-inputs.adb
+++ b/src/fltk-widgets-inputs.adb
@@ -27,11 +27,6 @@ package body FLTK.Widgets.Inputs is
            (F : in System.Address);
     pragma Import (C, free_fl_input, "free_fl_input");
 
-    function fl_input_get_value
-           (F : in System.Address)
-        return Interfaces.C.Strings.chars_ptr;
-    pragma Import (C, fl_input_get_value, "fl_input_get_value");
-
 
 
 
diff --git a/src/fltk-widgets-inputs.ads b/src/fltk-widgets-inputs.ads
index 350ac55..a461a89 100644
--- a/src/fltk-widgets-inputs.ads
+++ b/src/fltk-widgets-inputs.ads
@@ -1,5 +1,9 @@
 
 
+private with Interfaces.C.Strings;
+private with System;
+
+
 package FLTK.Widgets.Inputs is
 
 
@@ -31,5 +35,11 @@ private
            (This : in out Input);
 
 
+    function fl_input_get_value
+           (F : in System.Address)
+        return Interfaces.C.Strings.chars_ptr;
+    pragma Import (C, fl_input_get_value, "fl_input_get_value");
+
+
 end FLTK.Widgets.Inputs;