Demo updates (so they all will use the default scheme)

Added show(argc, argv) method to Fl_Help_Dialog.

Don't clear tab area in Fl_Tabs...


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

CHANGES

@@ -1,10 +1,19 @@
-CHANGES IN FLTK 1.1.0b8
+CHANGES IN FLTK 1.1.0b9
 
+	- Demo cleanup - made sure they all worked with
+	  schemes.
+	- Fl_Tabs no longer clears the unused area of the
+	  tab bar.
+	- Added show(argc, argv) method to Fl_Help_Dialog.
 	- MacOS: implemented cut/copy/paste.
 	- MacOS: improved keyboard handling, fixed keyboard
 	  focus handling, fixed get_key, modified 'keyboard'
 	  demo to show second mouse wheel and additional keys
 	  'help' and FL_NK+'='
+
+
+CHANGES IN FLTK 1.1.0b8
+
 	- OS/2 build fixes.
 	- fl_draw() didn't ignore symbol escapes properly for
 	  the browsers...

FL/Fl_Help_Dialog.H

@@ -42,6 +42,7 @@ public:
   void position(int xx, int yy);
   void resize(int xx, int yy, int ww, int hh);
   void show();
+  void show(int argc, char **argv);
   void textsize(uchar s);
   uchar textsize();
   void topline(const char *n);

src/Fl_Help_Dialog.cxx

@@ -182,6 +182,10 @@ void Fl_Help_Dialog::show() {
   window_->show();
 }
 
+void Fl_Help_Dialog::show(int argc, char **argv) {
+  window_->show(argc, argv);
+}
+
 void Fl_Help_Dialog::textsize(uchar s) {
   view_->textsize(s);
 

src/Fl_Help_Dialog.fl

@@ -14,7 +14,7 @@ class Fl_Help_Dialog {open
   Function {Fl_Help_Dialog()} {open
   } {
     Fl_Window window_ {
-      label {Help Dialog} open selected
+      label {Help Dialog} open
       private xywh {470 380 530 385} type Double resizable
       code0 {\#include <string.h>} visible
     } {
@@ -72,7 +72,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
 view_->topline(line_[index_]);}
-        tooltip {Show the previous help page.} private xywh {365 350 25 25} shortcut 0xff51 labelcolor 2
+        private tooltip {Show the previous help page.} xywh {365 350 25 25} shortcut 0xff51 labelcolor 2
       }
       Fl_Button forward_ {
         label {@->}
@@ -88,7 +88,7 @@ if (strcmp(view_->filename(), file_[index_]) != 0)
   view_->load(file_[index_]);
 
 view_->topline(line_[index_]);}
-        tooltip {Show the next help page.} private xywh {395 350 25 25} shortcut 0xff53 labelcolor 2
+        private tooltip {Show the next help page.} xywh {395 350 25 25} shortcut 0xff53 labelcolor 2
       }
       Fl_Button smaller_ {
         label F
@@ -98,7 +98,7 @@ view_->topline(line_[index_]);}
 if (view_->textsize() <= 8)
   smaller_->deactivate();
 larger_->activate();}
-        tooltip {Make the help text smaller.} private xywh {305 350 25 25} labelfont 1 labelsize 10
+        private tooltip {Make the help text smaller.} xywh {305 350 25 25} labelfont 1 labelsize 10
       }
       Fl_Button larger_ {
         label F
@@ -108,7 +108,7 @@ larger_->activate();}
 if (view_->textsize() >= 18)
   larger_->deactivate();
 smaller_->activate();}
-        tooltip {Make the help text larger.} private xywh {335 350 25 25} labelfont 1 labelsize 16
+        private tooltip {Make the help text larger.} xywh {335 350 25 25} labelfont 1 labelsize 16
       }
     }
     code {back_->deactivate();
@@ -146,6 +146,11 @@ window_->label(view_->title());} {}
   } {
     code {window_->show();} {}
   }
+  Function {show(int argc, char **argv)} {open return_type void
+  } {
+    code {window_->show(argc, argv);} {selected
+    }
+  }
   Function {textsize(uchar s)} {return_type void
   } {
     code {view_->textsize(s);

src/Fl_Tabs.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.5 2001/12/16 16:41:48 easysw Exp $"
+// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.6 2001/12/23 03:40:51 easysw Exp $"
 //
 // Tab widget for the Fast Light Tool Kit (FLTK).
 //
@@ -220,8 +220,6 @@ void Fl_Tabs::draw() {
   int H = tab_height();
 
   if (damage() & FL_DAMAGE_ALL) { // redraw the entire thing:
-    fl_color(color());
-    fl_rectf(x(), y()+(H>=0?0:h()+H), w(), H>=0?H:-H);
     draw_box(box(), x(), y()+(H>=0?H:0), w(), h()-(H>=0?H:-H), v ? v->color() : color());
     if (v) draw_child(*v);
   } else { // redraw the child
@@ -291,5 +289,5 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) :
 }
 
 //
-// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.5 2001/12/16 16:41:48 easysw Exp $".
+// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.6 2001/12/23 03:40:51 easysw Exp $".
 //

test/CubeMain.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: CubeMain.cxx,v 1.2.2.5 2001/03/15 22:39:56 easysw Exp $"
+// "$Id: CubeMain.cxx,v 1.2.2.5.2.1 2001/12/23 03:40:51 easysw Exp $"
 //
 // CubeView class definitions for the Fast Light Tool Kit (FLTK).
 //
@@ -28,7 +28,7 @@
 #include "CubeViewUI.h"
 
 int
-main(int /*argc*/, char ** /*argv*/) {
+main(int argc, char **argv) {
 
     CubeViewUI *cvui=new CubeViewUI;
     
@@ -36,12 +36,12 @@ main(int /*argc*/, char ** /*argv*/) {
     
     Fl::visual(FL_DOUBLE|FL_INDEX);
 
-    cvui->show();
+    cvui->show(argc, argv);
     
     return Fl::run();
 }
 
 
 //
-// End of "$Id: CubeMain.cxx,v 1.2.2.5 2001/03/15 22:39:56 easysw Exp $".
+// End of "$Id: CubeMain.cxx,v 1.2.2.5.2.1 2001/12/23 03:40:51 easysw Exp $".
 //

test/CubeViewUI.fl

@@ -10,7 +10,7 @@ class CubeViewUI {open
   Function {CubeViewUI()} {open
   } {
     Fl_Window mainWindow {
-      label CubeView open selected
+      label CubeView open
       private xywh {428 124 419 406} box UP_BOX labelsize 12 resizable visible
     } {
       Fl_Group {} {open
@@ -71,8 +71,8 @@ cube->redraw();}
       }
     }
   }
-  Function {show()} {open
+  Function {show(int argc, char **argv)} {open selected
   } {
-    code {mainWindow->show();} {}
+    code {mainWindow->show(argc, argv);} {}
   }
 } 

test/Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.22 2001/12/19 19:23:31 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.23 2001/12/23 03:40:51 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -131,6 +131,7 @@ ALL =	\
 	pixmap$(EXEEXT) \
 	pixmap_browser$(EXEEXT) \
 	radio$(EXEEXT) \
+	resize$(EXEEXT) \
 	resizebox$(EXEEXT) \
 	scroll$(EXEEXT) \
 	subwindow$(EXEEXT) \
@@ -252,5 +253,5 @@ uninstall:
 	@echo Nothing to uninstall in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.22 2001/12/19 19:23:31 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.23 2001/12/23 03:40:51 easysw Exp $".
 #

test/doublebuffer.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: doublebuffer.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: doublebuffer.cxx,v 1.4.2.3.2.1 2001/12/23 03:40:51 easysw Exp $"
 //
 // Double-buffering test program for the Fast Light Tool Kit (FLTK).
 //
@@ -91,7 +91,7 @@ public:
     : Fl_Double_Window(x,y,w,h,l) {resizable(this);}
 };
 
-int main() {
+int main(int argc, char **argv) {
   if (!Fl::visual(FL_DOUBLE))
     printf("Xdbe not supported, faking double buffer with pixmaps.\n");
   Fl_Window w01(420,420,"Fl_Single_Window"); w01.box(FL_FLAT_BOX);
@@ -114,7 +114,7 @@ int main() {
   slider1.callback(slider_cb, 1);
   w2.end();
   w02.end();
-  w01.show();
+  w01.show(argc, argv);
   w1.show();
   w02.show();
   w2.show();
@@ -122,5 +122,5 @@ int main() {
 }
 
 //
-// End of "$Id: doublebuffer.cxx,v 1.4.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: doublebuffer.cxx,v 1.4.2.3.2.1 2001/12/23 03:40:51 easysw Exp $".
 //

test/fonts.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: fonts.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: fonts.cxx,v 1.5.2.3.2.1 2001/12/23 03:40:51 easysw Exp $"
 //
 // Font demo program for the Fast Light Tool Kit (FLTK).
 //
@@ -131,6 +131,7 @@ void create_the_forms() {
 #include <FL/fl_ask.H>
 
 int main(int argc, char **argv) {
+  Fl::scheme(NULL);
   create_the_forms();
   int i = fl_choice("Which fonts:","-*","iso8859","All");
   int k = Fl::set_fonts(i ? (i>1 ? "*" : 0) : "-*");
@@ -164,5 +165,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: fonts.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: fonts.cxx,v 1.5.2.3.2.1 2001/12/23 03:40:51 easysw Exp $".
 //

test/help.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: help.cxx,v 1.1.2.2 2001/09/29 14:38:59 easysw Exp $"
+// "$Id: help.cxx,v 1.1.2.3 2001/12/23 03:40:51 easysw Exp $"
 //
 // Fl_Help_Dialog test program.
 //
@@ -52,7 +52,7 @@ main(int  argc,			// I - Number of command-line arguments
   else
     help->load(argv[1]);
 
-  help->show();
+  help->show(argc, argv);
 
   Fl::run();
 
@@ -63,5 +63,5 @@ main(int  argc,			// I - Number of command-line arguments
 
 
 //
-// End of "$Id: help.cxx,v 1.1.2.2 2001/09/29 14:38:59 easysw Exp $".
+// End of "$Id: help.cxx,v 1.1.2.3 2001/12/23 03:40:51 easysw Exp $".
 //

test/message.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $"
+// "$Id: message.cxx,v 1.5.2.3.2.2 2001/12/23 03:40:51 easysw Exp $"
 //
 // Message test program for the Fast Light Tool Kit (FLTK).
 //
@@ -29,6 +29,7 @@
 #include <stdio.h>
 
 int main(int, char **) {
+  Fl::scheme(NULL);
 
   fl_message("Spelling check sucessfull, %d errors found with %g%% confidence",
 	     1002, 100*(15/77.0));
@@ -54,5 +55,5 @@ int main(int, char **) {
 }
 
 //
-// End of "$Id: message.cxx,v 1.5.2.3.2.1 2001/12/12 21:33:34 easysw Exp $".
+// End of "$Id: message.cxx,v 1.5.2.3.2.2 2001/12/23 03:40:51 easysw Exp $".
 //

test/navigation.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: navigation.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: navigation.cxx,v 1.5.2.3.2.1 2001/12/23 03:40:51 easysw Exp $"
 //
 // Navigation test program for the Fast Light Tool Kit (FLTK).
 //
@@ -61,10 +61,10 @@ int main(int argc, char **argv) {
     if (n < window.children()) continue;
     window.insert(*(new Fl_Input(x,y,w,h)),j);
   }
-  window.show();
+  window.show(argc, argv);
   return Fl::run();
 }
 
 //
-// End of "$Id: navigation.cxx,v 1.5.2.3 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: navigation.cxx,v 1.5.2.3.2.1 2001/12/23 03:40:51 easysw Exp $".
 //

test/subwindow.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: subwindow.cxx,v 1.5.2.5 2001/01/22 15:13:41 easysw Exp $"
+// "$Id: subwindow.cxx,v 1.5.2.5.2.1 2001/12/23 03:40:51 easysw Exp $"
 //
 // Nested window test program for the Fast Light Tool Kit (FLTK).
 //
@@ -151,7 +151,7 @@ const char* bigmess =
 #endif
 ;
 
-int main(int, char **) {
+int main(int argc, char **argv) {
   testwindow *window =
     new testwindow(FL_UP_BOX,400,400,"outer");
   new Fl_Toggle_Button(310,310,80,80,"&outer");
@@ -178,10 +178,10 @@ int main(int, char **) {
   popup->type(Fl_Menu_Button::POPUP3);
   popup->add("This|is|a popup|menu");
   popup->add(bigmess);
-  window->show();
+  window->show(argc, argv);
   return Fl::run();
 }
 
 //
-// End of "$Id: subwindow.cxx,v 1.5.2.5 2001/01/22 15:13:41 easysw Exp $".
+// End of "$Id: subwindow.cxx,v 1.5.2.5.2.1 2001/12/23 03:40:51 easysw Exp $".
 //

test/threads.cxx

@@ -1,5 +1,5 @@
 //
-// "$Id: threads.cxx,v 1.10.2.1 2001/12/08 16:23:51 easysw Exp $"
+// "$Id: threads.cxx,v 1.10.2.2 2001/12/23 03:40:51 easysw Exp $"
 //
 // Threading example program for the Fast Light Tool Kit (FLTK).
 //
@@ -77,14 +77,14 @@ void* prime_func(void* p)
   return 0;
 }
 
-int main()
+int main(int argc, char **argv)
 {
   Fl_Window* w = new Fl_Window(200, 200, "Single Thread");
   browser1 = new Fl_Browser(0, 0, 200, 175);
   w->resizable(browser1);
   value1 = new Fl_Value_Output(100, 175, 200, 25, "Max Prime:");
   w->end();
-  w->show();
+  w->show(argc, argv);
   w = new Fl_Window(200, 200, "Six Threads");
   browser2 = new Fl_Browser(0, 0, 200, 175);
   w->resizable(browser2);
@@ -126,5 +126,5 @@ int main() {
 
 
 //
-// End of "$Id: threads.cxx,v 1.10.2.1 2001/12/08 16:23:51 easysw Exp $".
+// End of "$Id: threads.cxx,v 1.10.2.2 2001/12/23 03:40:51 easysw Exp $".
 //