diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/browser.cxx | 17 | ||||
| -rw-r--r-- | test/menubar.cxx | 24 |
2 files changed, 14 insertions, 27 deletions
diff --git a/test/browser.cxx b/test/browser.cxx index 14287e068..e9cb1e088 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: browser.cxx,v 1.5.2.6 2001/01/22 15:13:41 easysw Exp $" +// "$Id: browser.cxx,v 1.5.2.6.2.1 2001/11/02 20:38:15 easysw Exp $" // // Browser test program for the Fast Light Tool Kit (FLTK). // @@ -63,7 +63,8 @@ That was a blank line above this. #include <FL/Fl_Select_Browser.H> #include <FL/Fl_Double_Window.H> #include <FL/Fl_Button.H> -#include <FL/Fl_Input.H> +#include <FL/Fl_Int_Input.H> +#include <FL/fl_ask.H> #include <stdio.h> #include <string.h> #include <errno.h> @@ -74,7 +75,7 @@ Fl_Button *top, *bottom, *middle, *visible; -Fl_Input *field; +Fl_Int_Input *field; void b_cb(Fl_Widget* o, void*) { printf("callback, selection = %d, event_clicks = %d\n", @@ -84,6 +85,12 @@ void b_cb(Fl_Widget* o, void*) { void show_cb(Fl_Widget *o, void *) { int line = atoi(field->value()); + if (!line) { + fl_alert("Please enter a number in the text field\n" + "before clicking on the buttons."); + return; + } + if (o == top) browser->topline(line); else if (o == bottom) @@ -112,7 +119,7 @@ int main(int argc, char **argv) { } browser->position(0); - field = new Fl_Input(50, 350, 350, 25, "Line #:"); + field = new Fl_Int_Input(50, 350, 350, 25, "Line #:"); field->callback(show_cb); top = new Fl_Button(0, 375, 100, 25, "Top"); @@ -133,6 +140,6 @@ int main(int argc, char **argv) { } // -// End of "$Id: browser.cxx,v 1.5.2.6 2001/01/22 15:13:41 easysw Exp $". +// End of "$Id: browser.cxx,v 1.5.2.6.2.1 2001/11/02 20:38:15 easysw Exp $". // diff --git a/test/menubar.cxx b/test/menubar.cxx index 9def1d0eb..841e9e236 100644 --- a/test/menubar.cxx +++ b/test/menubar.cxx @@ -1,5 +1,5 @@ // -// "$Id: menubar.cxx,v 1.6.2.8 2001/01/22 15:13:41 easysw Exp $" +// "$Id: menubar.cxx,v 1.6.2.8.2.1 2001/11/02 20:38:15 easysw Exp $" // // Menubar test program for the Fast Light Tool Kit (FLTK). // @@ -164,24 +164,6 @@ Fl_Menu_Item pulldown[] = { Fl_Menu_* menus[4]; -// turn MicroSoft style on/off -void button_cb(Fl_Widget* w, void*) { - if (((Fl_Button*)w)->value()) { - for (int i = 0; i < 4; i++) { - menus[i]->down_box(FL_FLAT_BOX); - menus[i]->selection_color(137); - menus[i]->textfont(FL_HELVETICA); - } - } else { - for (int i = 0; i < 4; i++) { - menus[i]->down_box(FL_NO_BOX); - menus[i]->selection_color(FL_WHITE); - menus[i]->textfont(FL_BOLD|FL_ITALIC); - } - } - menus[0]->parent()->redraw(); -} - int main(int argc, char **argv) { //Fl::set_color(Fl_Color(15),0,0,128); for (int i=0; i<99; i++) { @@ -206,8 +188,6 @@ int main(int argc, char **argv) { mb.callback(test_cb); menus[3] = &mb; Fl_Box b(200,200,200,100,"Press right button\nfor a pop-up menu"); - Fl_Toggle_Button t(250,50,150,25,"MicroSoft Style"); - t.callback(button_cb); window.resizable(&mb); window.size_range(300,20); window.end(); @@ -216,5 +196,5 @@ int main(int argc, char **argv) { } // -// End of "$Id: menubar.cxx,v 1.6.2.8 2001/01/22 15:13:41 easysw Exp $". +// End of "$Id: menubar.cxx,v 1.6.2.8.2.1 2001/11/02 20:38:15 easysw Exp $". // |