Always resize cells in table if set/max width not the same as the

column width.

Pass UNFOCUS events to parent groups, too (for Fl_Tabs)

Conditionally compile in support for TrackMouseEvent(), since support
for it is spotty at best.


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

4 files changed, 27 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index e3519443f..020e888f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.1.0b11
 
+	- Now conditionally use the WIN32 TrackMouseEvent API
+	  (default is no...)
 	- Fixed a table rendering bug in the Fl_Help_View
 	  widget.
 	- The fltk-config script now recognizes all common C++
diff --git a/src/Fl.cxx b/src/Fl.cxx
index c4915666d..d3f10af9c 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.41.2.18 2002/01/09 21:50:02 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.19 2002/02/20 19:29:57 easysw Exp $"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -409,7 +409,7 @@ void Fl::focus(Fl_Widget *o) {
     Fl::compose_reset();
     focus_ = o;
     fl_oldfocus = 0;
-    for (; p && !p->contains(o); p = p->parent()) {
+    for (; p; p = p->parent()) {
       p->handle(FL_UNFOCUS);
       fl_oldfocus = p;
     }
@@ -855,5 +855,5 @@ void Fl_Window::flush() {
 }
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.18 2002/01/09 21:50:02 easysw Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.19 2002/02/20 19:29:57 easysw Exp $".
 //
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 41b7e1355..5cb3ed37c 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Help_View.cxx,v 1.1.2.26 2002/02/20 13:02:27 easysw Exp $"
+// "$Id: Fl_Help_View.cxx,v 1.1.2.27 2002/02/20 19:29:57 easysw Exp $"
 //
 // Fl_Help_View widget routines.
 //
@@ -1831,7 +1831,7 @@ Fl_Help_View::format_table(int        *table_width,	// O - Total table width
     else scale_width = width;
   }
 
-  if (width > scale_width)
+  if (width != scale_width)
   {
 //    printf("width = %d, scale_width = %d\n", width, scale_width);
 
@@ -2627,5 +2627,5 @@ hscrollbar_callback(Fl_Widget *s, void *)
 
 
 //
-// End of "$Id: Fl_Help_View.cxx,v 1.1.2.26 2002/02/20 13:02:27 easysw Exp $".
+// End of "$Id: Fl_Help_View.cxx,v 1.1.2.27 2002/02/20 19:29:57 easysw Exp $".
 //
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index af31bef82..11d2644bc 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37.2.16 2002/01/23 16:58:01 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.17 2002/02/20 19:29:57 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -50,10 +50,24 @@
 //
 // USE_ASYNC_SELECT - define it if you have WSAAsyncSelect()...
 //
+// This currently doesn't appear to work; needs to be fixed!
+//
 
-// MRS - this currently doesn't appear to work anymore; needs to be fixed!
 //#define USE_ASYNC_SELECT
 
+
+//
+// USE_TRACK_MOUSE - define it if you have TrackMouseEvent()...
+//
+// Apparently, at least some versions of Cygwin/MingW don't provide
+// the TrackMouseEvent() function.  You can define this by hand
+// if you have it - this is only needed to support subwindow
+// enter/leave notification under Windows.
+//
+
+//#define USE_TRACK_MOUSE
+
+
 //
 // WM_SYNCPAINT is an "undocumented" message, which is finally defined in
 // VC++ 6.0.
@@ -531,6 +545,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
   case WM_RBUTTONUP:    mouse_event(window, 2, 3, wParam, lParam); return 0;
 
   case WM_MOUSEMOVE:
+#ifdef USE_TRACK_MOUSE
       if (Fl::belowmouse() != window) {
         TRACKMOUSEEVENT tme;
 
@@ -540,6 +555,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 
         _TrackMouseEvent(&tme);
       }
+#endif // USE_TRACK_MOUSE
 
       mouse_event(window, 3, 0, wParam, lParam);
       return 0;
@@ -1049,5 +1065,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.16 2002/01/23 16:58:01 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.17 2002/02/20 19:29:57 easysw Exp $".
 //