Put new modal test in the right source file...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2572 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 8 insertions, 100 deletions

diff --git a/test/tabs.cxx b/test/tabs.cxx
deleted file mode 100644
index 2e3492d38..000000000
--- a/test/tabs.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0100
-
-#include "tabs.h"
-#include <FL/fl_ask.H>
-
-Fl_Window *foo_window=(Fl_Window *)0;
-
-static void cb_cancel(Fl_Button*, void*) {
-  exit(1);
-}
-
-static void cb_OK(Fl_Return_Button*, void*) {
-  exit(0);
-}
-
-static void cb_ask(Fl_Widget*, void*) {
-  fl_message("Test to see if this modal window prevents you from "
-	     "changing the tabs. It should.");
-}
-
-int main(int argc, char **argv) {
-  Fl_Window* w;
-  { Fl_Window* o = foo_window = new Fl_Window(321, 324);
-    w = o;
-    { Fl_Tabs* o = new Fl_Tabs(10, 10, 300, 200);
-      o->selection_color(7);
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "Label1");
-        o->selection_color(1);
-        o->hide();
-        new Fl_Input(60, 50, 240, 40, "input:");
-        new Fl_Input(60, 90, 240, 30, "input2:");
-        new Fl_Input(60, 120, 240, 80, "input3:");
-        o->end();
-        Fl_Group::current()->resizable(o);
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab2");
-        o->selection_color(2);
-        o->hide();
-        (new Fl_Button(20, 60, 100, 30, "button1"))->callback(cb_ask);
-        new Fl_Input(140, 100, 100, 30, "input in box2");
-        new Fl_Button(30, 140, 260, 30, "This is stuff inside the Fl_Group \"tab2\"");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab3");
-        o->selection_color(3);
-        o->hide();
-        new Fl_Button(20, 60, 60, 80, "button2");
-        new Fl_Button(80, 60, 60, 80, "button");
-        new Fl_Button(140, 60, 60, 80, "button");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "tab4");
-        o->selection_color(5);
-        o->labelfont(2);
-        o->hide();
-        new Fl_Button(20, 50, 60, 110, "button2");
-        new Fl_Button(80, 50, 60, 110, "button");
-        new Fl_Button(140, 50, 60, 110, "button");
-        o->end();
-      }
-      { Fl_Group* o = new Fl_Group(10, 30, 300, 180, "     tab5      ");
-        o->labeltype(FL_ENGRAVED_LABEL);
-        new Fl_Button(20, 80, 60, 80, "button2");
-        new Fl_Button(90, 90, 60, 80, "button");
-        { Fl_Clock* o = new Fl_Clock(160, 50, 100, 100, "Make sure this clock does not use processor time when this tab is hidden or w\
-indow is iconized");
-          o->box(FL_OSHADOW_BOX);
-          o->color(238);
-          o->selection_color(0);
-          o->labelfont(8);
-          o->labelsize(10);
-          o->align(130);
-        }
-        o->end();
-      }
-      o->end();
-      Fl_Group::current()->resizable(o);
-    }
-    new Fl_Input(60, 220, 130, 30, "inputA:");
-    new Fl_Input(60, 250, 250, 30, "inputB:");
-    { Fl_Button* o = new Fl_Button(180, 290, 60, 30, "cancel");
-      o->callback((Fl_Callback*)cb_cancel);
-    }
-    { Fl_Return_Button* o = new Fl_Return_Button(250, 290, 60, 30, "OK");
-      o->callback((Fl_Callback*)cb_OK);
-    }
-    o->end();
-  }
-  w->show(argc, argv);
-  return Fl::run();
-}
diff --git a/test/tabs.fl b/test/tabs.fl
index 0fe92be4e..c2e03db02 100644
--- a/test/tabs.fl
+++ b/test/tabs.fl
@@ -1,14 +1,11 @@
 # data file for the Fltk User Interface Designer (fluid)
 version 1.0100 
 header_name {.h} 
-code_name {.cxx} 
-gridx 10 
-gridy 10 
-snap 3
+code_name {.cxx}
 Function {} {open
 } {
   Fl_Window foo_window {open
-    xywh {674 782 321 324} resizable visible
+    xywh {674 671 321 324} resizable visible
   } {
     Fl_Tabs {} {open
       xywh {10 10 300 200} selection_color 7 resizable
@@ -32,10 +29,12 @@ Function {} {open
       }
       Fl_Group {} {
         label tab2 open
-        xywh {10 30 300 180} selection_color 2 hide
+        xywh {10 30 300 180} selection_color 2
       } {
         Fl_Button {} {
           label button1
+          callback {fl_message("Test to see if this modal window prevents you from "
+           "changing the tabs. It should.");}
           xywh {20 60 100 30}
         }
         Fl_Input {} {
@@ -82,8 +81,8 @@ Function {} {open
         }
       }
       Fl_Group {} {
-        label {     tab5      } open selected
-        xywh {10 30 300 180} labeltype ENGRAVED_LABEL
+        label {     tab5      } open
+        xywh {10 30 300 180} labeltype ENGRAVED_LABEL hide
       } {
         Fl_Button {} {
           label button2
@@ -115,7 +114,7 @@ Function {} {open
     }
     Fl_Return_Button {} {
       label OK
-      callback {exit(0);}
+      callback {exit(0);} selected
       xywh {250 290 60 30}
       code0 {\#include <stdlib.h>}
     }