Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.7
diff -u -p -r1.7 ChangeLog
--- ChangeLog	9 Apr 2003 13:06:31 -0000	1.7
+++ ChangeLog	9 Apr 2003 13:35:55 -0000
@@ -1,5 +1,29 @@
 2003-04-09  Angus Leeming  <angus.leeming@btopenworld.com>
 
+	Move tabfolder-specific code out of forms.c and allow individual
+	FL_OBJECTs to respond to such events. Means that the library
+	becomes extensible to new, user-defined widgets once again.
+
+	* lib/include/Basic.h: add FL_MOVEORIGIN to the FL_EVENTS enum.
+
+	* lib/forms.h:
+	* lib/include/forms.h: regenerated automatically.
+
+	* lib/forms.c (fl_handle_form): no longer a static function.
+	Dispatch FL_MOVEORIGIN events to the form's constituent objects.
+	(fl_get_tabfolder_origin): removed. Functionality moved into
+	tabfolder.c.
+	(do_interaction_step): no longer call fl_get_tabfolder_origin. Instead,
+	dispatch a call to fl_handle_form(form, FL_MOVEORIGIN, ...).
+
+	* lib/tabfolder.c (handle): add FL_MOVEORIGIN to the event switch.
+	Update the x,y absolute coords of the active_folder and dispatch
+	a call to fl_handle_form(active_folder, FL_MOVEORIGIN, ...) to
+	ensure that the x,y absolute coords of nested tabfolders are also
+	updated.
+
+2003-04-09  Angus Leeming  <angus.leeming@btopenworld.com>
+
 	* lib/objects.c (hide_tooltip): renamed as checked_hide_tooltip.
 	(unconditional_hide_tooltip): new static helper function,
 	invoked within fl_handle_it on FL_KEYPRESS and FL_PUSH events.
Index: lib/forms.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/forms.c,v
retrieving revision 1.1
diff -u -p -r1.1 forms.c
--- lib/forms.c	6 Apr 2003 15:52:39 -0000	1.1
+++ lib/forms.c	9 Apr 2003 13:35:58 -0000
@@ -1306,7 +1306,7 @@ fl_keyboard(FL_FORM * form, int key, FL_
 }
 
 /* updates a form according to an event */
-static void
+void
 fl_handle_form(FL_FORM * form, int event, int key, XEvent * xev)
 {
     FL_OBJECT *obj = 0, *obj1;
@@ -1437,12 +1437,13 @@ fl_handle_form(FL_FORM * form, int event
 	    obj1 = fl_find_object(obj1->next, FL_FIND_AUTOMATIC, 0, 0);
 	}
 	break;
+    case FL_MOVEORIGIN:
     case FL_OTHER:
 	/* need to dispatch it thru all objects and monitor the status of
 	   forms as it may get closed */
 	for (obj1 = form->first; obj1 && form->visible; obj1 = obj1->next)
 	    if (obj1->visible)
-		fl_handle_object(obj1, FL_OTHER, xx, yy, key, xev);
+		fl_handle_object(obj1, event, xx, yy, key, xev);
 	break;
     }
 }
@@ -1754,24 +1755,6 @@ xmask2key(unsigned mask)
 }
 
 
-/* Ensure that the tabfolder forms' x,y coords are updated correctly */
-static void
-fl_get_tabfolder_origin(FL_FORM * form)
-{
-    FL_OBJECT *ob = 0;
-
-    for (ob = form->first; ob; ob = ob->next) {
-	if (ob->objclass == FL_TABFOLDER) {
-	    FL_FORM * const folder = fl_get_active_folder(ob);
-	    if (folder && folder->window) {
-		fl_get_winorigin(folder->window, &(folder->x), &(folder->y));
-		/* Don't forget nested folders */
-		fl_get_tabfolder_origin(folder);
-	    }
-	}
-    }
-}
-
 static void
 do_interaction_step(int wait_io)
 {
@@ -2068,8 +2051,11 @@ do_interaction_step(int wait_io)
 				   st_xev.xconfigure.height != evform->h));
 
 
-	/* Ensure that the tabfolder forms' x,y coords are updated correctly */
-	fl_get_tabfolder_origin(evform);
+	/* Dragging the form across the screen changes its absolute x,y coords.
+	   Objects that themselves contain forms should ensure that they are
+	   up to date.
+	*/
+	fl_handle_form(evform, FL_MOVEORIGIN, 0, &st_xev);
 
 	if (!st_xev.xconfigure.send_event)
 	{
Index: lib/forms.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/forms.h,v
retrieving revision 1.2
diff -u -p -r1.2 forms.h
--- lib/forms.h	9 Apr 2003 09:22:41 -0000	1.2
+++ lib/forms.h	9 Apr 2003 13:36:02 -0000
@@ -84,7 +84,7 @@ extern "C"
 #endif				/* FL_WIN32 */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: Basic.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Basic definitions and limits.
  *  Window system independent prototypes
@@ -405,7 +405,11 @@ typedef enum
     FL_TRPLCLICK,		/* triple click            */
     FL_ATTRIB,			/* attribute change        */
     FL_KEYRELEASE,
-    FL_PS			/* dump a form into EPS    */
+    FL_PS,			/* dump a form into EPS    */
+    FL_MOVEORIGIN		/* dragging the form across the screen
+				   changes its absolute x,y coords. Objects
+				   that themselves contain forms should
+				   ensure that they are up to date. */
 }
 FL_EVENTS;
 
@@ -1750,7 +1754,7 @@ typedef const char *(*FL_VAL_FILTER) (FL
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: XBasic.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  X Window dependent stuff
  *
@@ -2803,7 +2807,7 @@ typedef struct
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: bitmap.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *   Object Class: Bitmap
  */
@@ -2959,7 +2963,7 @@ FL_EXPORT Pixmap fl_create_from_pixmapda
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: box.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_BOX_H
@@ -2992,7 +2996,7 @@ FL_EXPORT FL_OBJECT *fl_add_box(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: browser.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object class Browser
  */
@@ -3234,7 +3238,7 @@ FL_EXPORT FL_BROWSER_SCROLL_CALLBACK fl_
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: button.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * All Buttons: regular button, light button and round button
  *
@@ -3605,7 +3609,7 @@ FL_EXPORT void fl_add_button_class(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: canvas.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Header for FL_CANVAS
  *
@@ -3764,7 +3768,7 @@ FL_EXPORT void fl_canvas_yield_to_shortc
 /****FL_CANVAS_H ******/
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: chart.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Object Class: Chart
  *
@@ -3892,7 +3896,7 @@ FL_EXPORT void fl_set_chart_baseline(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: choice.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_CHOICE_H
@@ -4032,7 +4036,7 @@ FL_EXPORT int fl_set_choice_notitle(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: clipbd.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * prototypes for clipboard stuff
  *
@@ -4069,7 +4073,7 @@ FL_EXPORT int fl_request_clipboard(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: clock.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_CLOCK_H
@@ -4129,7 +4133,7 @@ FL_EXPORT void fl_set_clock_ampm(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: counter.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 
@@ -4228,7 +4232,7 @@ FL_EXPORT void fl_set_counter_filter(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: cursor.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Cursor defs and prototypes
  *
@@ -4290,7 +4294,7 @@ FL_EXPORT Cursor fl_get_cursor_byname(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: dial.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 #ifndef FL_DIAL_H
 #define FL_DIAL_H
@@ -4395,7 +4399,7 @@ FL_EXPORT void fl_set_dial_direction(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: filesys.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Convenience functions to read a directory
  */
@@ -4486,7 +4490,7 @@ FL_EXPORT char *fl_fix_dirname(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: flps.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 
 #ifndef FLPS_H
@@ -4541,7 +4545,7 @@ FL_EXPORT int fl_object_ps_dump(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: formbrowser.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_FORMBROWSER_H
@@ -4687,7 +4691,7 @@ FL_EXPORT FL_FORM *fl_get_formbrowser_fo
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: frame.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 
@@ -4756,7 +4760,7 @@ FL_EXPORT FL_OBJECT *fl_add_labelframe(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: free.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object Class: Free
  */
@@ -4799,7 +4803,7 @@ FL_EXPORT FL_OBJECT *fl_add_free(
 #endif /* !def FREE_H } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: goodies.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 #ifndef FL_GOODIES_H
 #define FL_GOODIES_H		/* { */
@@ -5174,7 +5178,7 @@ FL_EXPORT int fl_goodies_atclose(
 #endif /* } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: input.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_INPUT_H
@@ -5414,7 +5418,7 @@ FL_EXPORT void fl_set_input_editkeymap(
 #endif /* Input_H  } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: menu.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_MENU_H
@@ -5550,7 +5554,7 @@ FL_EXPORT int fl_set_menu_entries(
 #endif /* MENU } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: menubar.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_MENUBAR_H
@@ -5591,7 +5595,7 @@ FL_EXPORT void fl_set_menubar_entries(FL
 #endif /* MENUBAR } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: popup.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Prototypes for pop-up menus
  */
@@ -5792,7 +5796,7 @@ FL_EXPORT void fl_setpup_submenu(
 #endif /* Xpopup } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: positioner.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_POSITIONER_H
@@ -5993,7 +5997,7 @@ FL_EXPORT void fl_set_scrollbar_step(
 #endif   /* SCROLLBAR */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: slider.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Object Class: Slider
  *
@@ -6143,7 +6147,7 @@ FL_EXPORT void fl_set_slider_filter(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: tabfolder.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_FOLDER_H
@@ -6299,7 +6303,7 @@ FL_EXPORT int fl_set_tabfolder_offset(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: text.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_TEXT_H
@@ -6340,7 +6344,7 @@ FL_EXPORT FL_OBJECT *fl_add_text(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: thumbwheel.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 
 #ifndef FL_THUMBWHEEL_H
@@ -6426,7 +6430,7 @@ FL_EXPORT FL_OBJECT *fl_add_thumbwheel(
 #endif    /* THUMBWHEEL_H */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: timer.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object Class: Timer
  *
@@ -6512,7 +6516,7 @@ FL_EXPORT void fl_resume_timer(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: xyplot.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_XYPLOT_H_
Index: lib/tabfolder.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/tabfolder.c,v
retrieving revision 1.1
diff -u -p -r1.1 tabfolder.c
--- lib/tabfolder.c	6 Apr 2003 15:52:40 -0000	1.1
+++ lib/tabfolder.c	9 Apr 2003 13:36:03 -0000
@@ -77,6 +77,14 @@ handle(FL_OBJECT * ob, int event, FL_Coo
 
     switch (event)
     {
+    case FL_MOVEORIGIN: {
+	FL_FORM * const folder = fl_get_active_folder(ob);
+	fl_get_winorigin(folder->window, &(folder->x), &(folder->y));
+	/* Don't forget nested folders */
+	fl_handle_form(folder, FL_MOVEORIGIN, 0, ev);
+	break;
+    }
+
     case FL_ATTRIB:
     case FL_DRAW:
 	fl_set_canvas_decoration(sp->canvas, fl_boxtype2frametype(ob->boxtype));
@@ -866,7 +874,7 @@ static void
 compute_position(FL_OBJECT * ob)
 {
 #if 0
-    if (((SPEC *) (ob->spec))->nforms == 0)
+    if (((ob->spec)->nforms) == 0)
 	return;
 #endif
 #if TBDEBUG
@@ -878,6 +886,7 @@ compute_position(FL_OBJECT * ob)
     else
 	compute_top_position(ob);
 
+    
 }
 
 int
Index: lib/include/Basic.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/include/Basic.h,v
retrieving revision 1.1
diff -u -p -r1.1 Basic.h
--- lib/include/Basic.h	6 Apr 2003 15:52:40 -0000	1.1
+++ lib/include/Basic.h	9 Apr 2003 13:36:04 -0000
@@ -343,7 +343,11 @@ typedef enum
     FL_TRPLCLICK,		/* triple click            */
     FL_ATTRIB,			/* attribute change        */
     FL_KEYRELEASE,
-    FL_PS			/* dump a form into EPS    */
+    FL_PS,			/* dump a form into EPS    */
+    FL_MOVEORIGIN		/* dragging the form across the screen
+				   changes its absolute x,y coords. Objects
+				   that themselves contain forms should
+				   ensure that they are up to date. */
 }
 FL_EVENTS;
 
Index: lib/include/forms.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/include/forms.h,v
retrieving revision 1.2
diff -u -p -r1.2 forms.h
--- lib/include/forms.h	9 Apr 2003 09:22:41 -0000	1.2
+++ lib/include/forms.h	9 Apr 2003 13:36:08 -0000
@@ -84,7 +84,7 @@ extern "C"
 #endif				/* FL_WIN32 */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: Basic.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Basic definitions and limits.
  *  Window system independent prototypes
@@ -405,7 +405,11 @@ typedef enum
     FL_TRPLCLICK,		/* triple click            */
     FL_ATTRIB,			/* attribute change        */
     FL_KEYRELEASE,
-    FL_PS			/* dump a form into EPS    */
+    FL_PS,			/* dump a form into EPS    */
+    FL_MOVEORIGIN		/* dragging the form across the screen
+				   changes its absolute x,y coords. Objects
+				   that themselves contain forms should
+				   ensure that they are up to date. */
 }
 FL_EVENTS;
 
@@ -1750,7 +1754,7 @@ typedef const char *(*FL_VAL_FILTER) (FL
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: XBasic.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  X Window dependent stuff
  *
@@ -2803,7 +2807,7 @@ typedef struct
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: bitmap.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *   Object Class: Bitmap
  */
@@ -2959,7 +2963,7 @@ FL_EXPORT Pixmap fl_create_from_pixmapda
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: box.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_BOX_H
@@ -2992,7 +2996,7 @@ FL_EXPORT FL_OBJECT *fl_add_box(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: browser.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object class Browser
  */
@@ -3234,7 +3238,7 @@ FL_EXPORT FL_BROWSER_SCROLL_CALLBACK fl_
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: button.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * All Buttons: regular button, light button and round button
  *
@@ -3605,7 +3609,7 @@ FL_EXPORT void fl_add_button_class(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: canvas.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Header for FL_CANVAS
  *
@@ -3764,7 +3768,7 @@ FL_EXPORT void fl_canvas_yield_to_shortc
 /****FL_CANVAS_H ******/
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: chart.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Object Class: Chart
  *
@@ -3892,7 +3896,7 @@ FL_EXPORT void fl_set_chart_baseline(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: choice.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_CHOICE_H
@@ -4032,7 +4036,7 @@ FL_EXPORT int fl_set_choice_notitle(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: clipbd.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * prototypes for clipboard stuff
  *
@@ -4069,7 +4073,7 @@ FL_EXPORT int fl_request_clipboard(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: clock.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_CLOCK_H
@@ -4129,7 +4133,7 @@ FL_EXPORT void fl_set_clock_ampm(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: counter.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 
@@ -4228,7 +4232,7 @@ FL_EXPORT void fl_set_counter_filter(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: cursor.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Cursor defs and prototypes
  *
@@ -4290,7 +4294,7 @@ FL_EXPORT Cursor fl_get_cursor_byname(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: dial.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 #ifndef FL_DIAL_H
 #define FL_DIAL_H
@@ -4395,7 +4399,7 @@ FL_EXPORT void fl_set_dial_direction(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: filesys.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Convenience functions to read a directory
  */
@@ -4486,7 +4490,7 @@ FL_EXPORT char *fl_fix_dirname(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: flps.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 
 #ifndef FLPS_H
@@ -4541,7 +4545,7 @@ FL_EXPORT int fl_object_ps_dump(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: formbrowser.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_FORMBROWSER_H
@@ -4687,7 +4691,7 @@ FL_EXPORT FL_FORM *fl_get_formbrowser_fo
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: frame.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 
@@ -4756,7 +4760,7 @@ FL_EXPORT FL_OBJECT *fl_add_labelframe(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: free.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object Class: Free
  */
@@ -4799,7 +4803,7 @@ FL_EXPORT FL_OBJECT *fl_add_free(
 #endif /* !def FREE_H } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: goodies.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 #ifndef FL_GOODIES_H
 #define FL_GOODIES_H		/* { */
@@ -5174,7 +5178,7 @@ FL_EXPORT int fl_goodies_atclose(
 #endif /* } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: input.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_INPUT_H
@@ -5414,7 +5418,7 @@ FL_EXPORT void fl_set_input_editkeymap(
 #endif /* Input_H  } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: menu.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_MENU_H
@@ -5550,7 +5554,7 @@ FL_EXPORT int fl_set_menu_entries(
 #endif /* MENU } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: menubar.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_MENUBAR_H
@@ -5591,7 +5595,7 @@ FL_EXPORT void fl_set_menubar_entries(FL
 #endif /* MENUBAR } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: popup.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Prototypes for pop-up menus
  */
@@ -5792,7 +5796,7 @@ FL_EXPORT void fl_setpup_submenu(
 #endif /* Xpopup } */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: positioner.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_POSITIONER_H
@@ -5993,7 +5997,7 @@ FL_EXPORT void fl_set_scrollbar_step(
 #endif   /* SCROLLBAR */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: slider.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  * Object Class: Slider
  *
@@ -6143,7 +6147,7 @@ FL_EXPORT void fl_set_slider_filter(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: tabfolder.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_FOLDER_H
@@ -6299,7 +6303,7 @@ FL_EXPORT int fl_set_tabfolder_offset(
 #endif 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: text.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_TEXT_H
@@ -6340,7 +6344,7 @@ FL_EXPORT FL_OBJECT *fl_add_text(
 
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: thumbwheel.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  */
 
 #ifndef FL_THUMBWHEEL_H
@@ -6426,7 +6430,7 @@ FL_EXPORT FL_OBJECT *fl_add_thumbwheel(
 #endif    /* THUMBWHEEL_H */
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: timer.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  *  Object Class: Timer
  *
@@ -6512,7 +6516,7 @@ FL_EXPORT void fl_resume_timer(
 #endif
 
 /*
- * $Id: forms.h,v 1.2 2003/04/09 09:22:41 leeming Exp $
+ * $Id: xyplot.h,v 1.1 2003/04/06 15:52:40 leeming Exp $
  *
  */
 #ifndef FL_XYPLOT_H_