Fix position() methods that shadow Fl_Widget::position()

* `FL_DEPRECATED` macro to mark `position()` method that shadow `Fl_Widget::position()` #69 (#666)

6 files changed, 10 insertions, 10 deletions

diff --git a/test/browser.cxx b/test/browser.cxx
index b4b8cdbb0..d269f0d57 100644
--- a/test/browser.cxx
+++ b/test/browser.cxx
@@ -174,7 +174,7 @@ int main(int argc, char **argv) {
     browser->add("@bBold text");
     browser->add("@iItalic text");
   }
-  browser->position(0);
+  browser->vposition(0);
 
   field = new Fl_Int_Input(55, 350, window.w()-55, 25, "Line #:");
   field->callback(show_cb);
diff --git a/test/glpuzzle.cxx b/test/glpuzzle.cxx
index 1c1f8b4e4..2e8a307d5 100644
--- a/test/glpuzzle.cxx
+++ b/test/glpuzzle.cxx
@@ -1130,7 +1130,7 @@ Reshape(int width, int height)
 
   W = width;
   H = height;
-  glViewport(0, 0, W, H);
+  glViewport(0, 0, (GLsizei)W, (GLsizei)H);
   glGetIntegerv(GL_VIEWPORT, viewport);
 }
 
@@ -1453,7 +1453,7 @@ main(int argc, char **argv)
     }
   }
 
-  glutInitWindowSize(W, H);
+  glutInitWindowSize((int)W, (int)H);
   if (doubleBuffer) {
     glutInitDisplayMode(GLUT_DEPTH | GLUT_RGB | GLUT_DOUBLE | GLUT_MULTISAMPLE);
   } else {
diff --git a/test/input.cxx b/test/input.cxx
index 2b6e15c06..70c47c852 100644
--- a/test/input.cxx
+++ b/test/input.cxx
@@ -49,7 +49,7 @@ void test(Fl_Input *i) {
   if (i->changed()) {
     i->clear_changed(); G_tty->printf("%s '%s'\n",i->label(),i->value());
     char utf8buf[10];
-    int last = fl_utf8encode(i->index(i->position()), utf8buf);
+    int last = fl_utf8encode(i->index(i->insert_position()), utf8buf);
     utf8buf[last] = 0;
     G_tty->printf("Symbol at cursor position: %s\n", utf8buf);
   }
diff --git a/test/keyboard.cxx b/test/keyboard.cxx
index a3603cabf..46ba6142f 100644
--- a/test/keyboard.cxx
+++ b/test/keyboard.cxx
@@ -97,14 +97,14 @@ int main(int argc, char** argv) {
     for (int c = 0; c < window->children(); c++) {
       Fl_Widget* b = window->child(c);
       if (b->callback() == (Fl_Callback*)key_cb) {
-        int i = b->argument();
+        int i = (int)b->argument();
         if (!i) i = b->label()[0];
         Fl_Button *btn = ((Fl_Button*)b);
         int state = Fl::event_key(i);
         if (btn->value()!=state)
           btn->value(state);
       } else if (b->callback() == (Fl_Callback*)shift_cb) {
-        int i = b->argument();
+        int i = (int)b->argument();
         Fl_Button *btn = ((Fl_Button*)b);
         int state = Fl::event_state(i);
         if (btn->value()!=state)
diff --git a/test/line_style.cxx b/test/line_style.cxx
index f1517ee86..67b1fde08 100644
--- a/test/line_style.cxx
+++ b/test/line_style.cxx
@@ -47,10 +47,10 @@ void test_box::draw() {
   dashes[3] = char(sliders[8]->value());
   dashes[4] = 0;
   fl_line_style(
-    choice[0]->mvalue()->argument() +
+    (int)(choice[0]->mvalue()->argument() +
     choice[1]->mvalue()->argument() +
-    choice[2]->mvalue()->argument(),
-    long(sliders[3]->value()),          // width
+    choice[2]->mvalue()->argument()),
+    (int)(sliders[3]->value()),          // width
     dashes);
 
   // draw the defined fl_rect and fl_vertex first and then
diff --git a/test/unittest_unicode.cxx b/test/unittest_unicode.cxx
index 0f6865a6b..a1a4db812 100644
--- a/test/unittest_unicode.cxx
+++ b/test/unittest_unicode.cxx
@@ -71,7 +71,7 @@ class Ut_Unicode_Box_Test : public Fl_Group {
     int fontsize = (int)fontsize_slider->value();
     textdisplay->textsize(fontsize);
     multilineinput->textsize(fontsize);
-    multilineinput->position(0);                // keep scrolled to top
+    multilineinput->insert_position(0);                // keep scrolled to top
     parent()->redraw();
   }
   static void font_size_slider_cb(Fl_Widget*, void *userdata) {