From 6be2be6d436eaae5579c8816d0c0d4cab0c2c7b5 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sun, 23 Dec 2001 03:40:51 +0000
Subject: 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
---
 src/Fl_Help_Dialog.cxx |  4 ++++
 src/Fl_Help_Dialog.fl  | 15 ++++++++++-----
 src/Fl_Tabs.cxx        |  6 ++----
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index 5521cdc8c..88ea74f41 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/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);
 
diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl
index 9ec4927a9..bd333badc 100644
--- a/src/Fl_Help_Dialog.fl
+++ b/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);
diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx
index 71861fc0c..546988d10 100644
--- a/src/Fl_Tabs.cxx
+++ b/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 $".
 //
-- 
cgit v1.2.3