FLUID didn't support the plastic boxtypes.

Move Fl_Tooltip::enter(0) to the end of Fl_Window::hide(); otherwise we get nasty recursion problems... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1859 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Dec 17, 2001 · 6d4bda2 · 6d4bda2
1 parent 073701c
commit 6d4bda2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.0b8
 
+	- FLUID didn't list the plastic box and frame types.
 	- Now hide the tooltip window whenever a window is
 	  hidden.  Otherwise a tooltip window could keep an
 	  application running.

diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.9 2001/12/17 01:02:16 easysw Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.10 2001/12/17 13:48:59 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -501,6 +501,8 @@ Fl_Menu_Item boxmenu[] = {
 {"OVAL_BOX",0,0,(void *)FL_OVAL_BOX},
 {"OSHADOW_BOX",0,0,(void *)FL_OSHADOW_BOX},
 {"OFLAT_BOX",0,0,(void *)FL_OFLAT_BOX},
+{"PLASTIC_UP_BOX",0,0,(void *)FL_PLASTIC_UP_BOX},
+{"PLASTIC_DOWN_BOX",0,0,(void *)FL_PLASTIC_DOWN_BOX},
 {0},
 {"frames",0,0,0,FL_SUBMENU},
 {"UP_FRAME",0,0,(void *)FL_UP_FRAME},
@@ -513,6 +515,8 @@ Fl_Menu_Item boxmenu[] = {
 {"SHADOW_FRAME",0,0,(void *)FL_SHADOW_FRAME},
 {"ROUNDED_FRAME",0,0,(void *)FL_ROUNDED_FRAME},
 {"OVAL_FRAME",0,0,(void *)FL_OVAL_FRAME},
+{"PLASTIC_UP_FRAME",0,0,(void *)FL_PLASTIC_UP_FRAME},
+{"PLASTIC_DOWN_FRAME",0,0,(void *)FL_PLASTIC_DOWN_FRAME},
 {0},
 {0}};
 
@@ -1970,5 +1974,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.9 2001/12/17 01:02:16 easysw Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.10 2001/12/17 13:48:59 easysw Exp $".
 //
diff --git a/src/Fl.cxx b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.41.2.12 2001/12/17 01:16:48 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.13 2001/12/17 13:48:59 easysw Exp $"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -650,9 +650,6 @@ void Fl_Window::hide() {
 
   if (!shown()) return;
 
-  // Hide any visible tooltips...
-  Fl_Tooltip::enter(0);
-
   // remove from the list of windows:
   Fl_X* x = i;
   Fl_X** pp = &Fl_X::first;
@@ -711,6 +708,9 @@ void Fl_Window::hide() {
     Fl::first_window()->show();
 #endif
   delete x;
+
+  // Hide any visible tooltips...
+  Fl_Tooltip::enter(0);
 }
 
 Fl_Window::~Fl_Window() {
@@ -844,5 +844,5 @@ void Fl_Window::flush() {
 }
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.12 2001/12/17 01:16:48 easysw Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.13 2001/12/17 13:48:59 easysw Exp $".
 //