More mouse wheel stuff (as compatible as possible with the 2.0 code...)

Updated the makefile to use config.status --recheck before calling
config.status (why they can't provide one that does both, I don't
know...)


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

4 files changed, 46 insertions, 9 deletions

diff --git a/src/Fl.cxx b/src/Fl.cxx
index 86a2416f3..795a39566 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl.cxx,v 1.24.2.41.2.2 2001/08/02 15:31:59 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.3 2001/08/02 20:09:25 easysw Exp $"
 //
 // Main event handling code for the Fast Light Tool Kit (FLTK).
 //
@@ -45,6 +45,8 @@ int		Fl::damage_,
 		Fl::e_y,
 		Fl::e_x_root,
 		Fl::e_y_root,
+		Fl::e_dx,
+		Fl::e_dy,
 		Fl::e_state,
 		Fl::e_clicks,
 		Fl::e_is_click,
@@ -788,5 +790,5 @@ void Fl_Window::flush() {
 }
 
 //
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.2 2001/08/02 15:31:59 easysw Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.3 2001/08/02 20:09:25 easysw Exp $".
 //
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 3fe4f4ec5..e6d97dd7c 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_win32.cxx,v 1.33.2.37 2001/04/27 15:43:38 easysw Exp $"
+// "$Id: Fl_win32.cxx,v 1.33.2.37.2.1 2001/08/02 20:09:25 easysw Exp $"
 //
 // WIN32-specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -58,6 +58,14 @@
 #  define WM_MOUSELEAVE 0x02a3
 #endif
 
+#ifndef WM_MOUSEWHEEL
+#  define WM_MOUSEWHEEL 0x020a
+#endif
+
+#ifndef WHEEL_DELTA
+#	define WHEEL_DELTA 120	// according to MSDN.
+#endif
+
 //
 // WM_FLSELECT is the user-defined message that we get when one of
 // the sockets has pending data, etc.
@@ -581,6 +589,15 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
     if (Fl::handle(FL_KEYBOARD,window)) return 0;
     break;}
 
+  case WM_MOUSEWHEEL: {
+    static int delta = 0; // running total of all motion
+    delta += (SHORT)(HIWORD(wParam));
+    Fl::e_dy = delta / WHEEL_DELTA;
+    delta -= Fl::e_dy * WHEEL_DELTA;
+    if (Fl::e_dy) Fl::handle(FL_MOUSEWHEEL, window);
+    return 0;
+  }
+
   case WM_GETMINMAXINFO:
     Fl_X::i(window)->set_minmax((LPMINMAXINFO)lParam);
     break;
@@ -974,5 +991,5 @@ void Fl_Window::make_current() {
 }
 
 //
-// End of "$Id: Fl_win32.cxx,v 1.33.2.37 2001/04/27 15:43:38 easysw Exp $".
+// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.1 2001/08/02 20:09:25 easysw Exp $".
 //
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 8905e0f40..63441ef4c 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.24.2.24 2001/04/27 14:39:27 easysw Exp $"
+// "$Id: Fl_x.cxx,v 1.24.2.24.2.1 2001/08/02 20:09:25 easysw Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -448,9 +448,18 @@ int fl_handle(const XEvent& xevent)
 
   case ButtonPress:
     Fl::e_keysym = FL_Button + xevent.xbutton.button;
-    set_event_xy(); checkdouble();
-    Fl::e_state |= (FL_BUTTON1 << (xevent.xbutton.button-1));
-    event = FL_PUSH;
+    set_event_xy();
+    if (xevent.xbutton.button == 4) {
+      Fl::e_dy = +1;
+      event = FL_MOUSEWHEEL;
+    } else if (xevent.xbutton.button == 5) {
+      Fl::e_dy = -1;
+      event = FL_MOUSEWHEEL;
+    } else {
+      Fl::e_state |= (FL_BUTTON1 << (xevent.xbutton.button-1));
+      event = FL_PUSH;
+      checkdouble();
+    }
     break;
 
   case MotionNotify:
@@ -918,5 +927,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.24.2.24 2001/04/27 14:39:27 easysw Exp $".
+// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.1 2001/08/02 20:09:25 easysw Exp $".
 //
diff --git a/src/makedepend b/src/makedepend
index 7e893cd21..1f5241bdd 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -78,6 +78,15 @@ Fl_FileIcon.o: ../FL/filename.H
 Fl_Group.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Group.H
 Fl_Group.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 Fl_Group.o: ../FL/fl_draw.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
+Fl_HelpDialog.o: ../FL/Fl_HelpDialog.H ../FL/Fl.H ../FL/Enumerations.H
+Fl_HelpDialog.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
+Fl_HelpDialog.o: ../FL/Fl_HelpView.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
+Fl_HelpDialog.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
+Fl_HelpDialog.o: ../FL/Fl_Button.H
+Fl_HelpView.o: ../FL/Fl_HelpView.H ../FL/Fl.H ../FL/Enumerations.H
+Fl_HelpView.o: ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+Fl_HelpView.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H
+Fl_HelpView.o: ../config.h ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
 Fl_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/fl_draw.H ../FL/x.H
 Fl_Image.o: ../FL/Fl_Window.H ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H
 Fl_Image.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H