Bladeren bron

* renamed forms unit to xforms to prevent conflict with Forms
from the LCL

peter 22 jaren geleden
bovenliggende
commit
b409f807f5
50 gewijzigde bestanden met toevoegingen van 346 en 135 verwijderingen
  1. 1 1
      packages/extra/forms/Makefile.fpc
  2. 10 7
      packages/extra/forms/demo/arrowbutton.pp
  3. 7 5
      packages/extra/forms/demo/borderwidth.pp
  4. 7 7
      packages/extra/forms/demo/boxtype.pp
  5. 7 2
      packages/extra/forms/demo/browserall.pp
  6. 7 2
      packages/extra/forms/demo/browserop.pp
  7. 7 2
      packages/extra/forms/demo/buttonall.pp
  8. 6 1
      packages/extra/forms/demo/butttypes.pp
  9. 7 3
      packages/extra/forms/demo/canvas.pp
  10. 7 2
      packages/extra/forms/demo/chartall.pp
  11. 7 2
      packages/extra/forms/demo/chartstrip.pp
  12. 7 2
      packages/extra/forms/demo/choice.pp
  13. 7 2
      packages/extra/forms/demo/colbrowser.pp
  14. 7 7
      packages/extra/forms/demo/colsel.pp
  15. 7 2
      packages/extra/forms/demo/colsel1.pp
  16. 7 3
      packages/extra/forms/demo/counter.pp
  17. 7 3
      packages/extra/forms/demo/cursor.pp
  18. 7 2
      packages/extra/forms/demo/fbrowse.pp
  19. 7 2
      packages/extra/forms/demo/fbrowse1.pp
  20. 7 2
      packages/extra/forms/demo/fdial.pp
  21. 7 2
      packages/extra/forms/demo/flclock.pp
  22. 7 2
      packages/extra/forms/demo/fonts.pp
  23. 7 2
      packages/extra/forms/demo/free1.pp
  24. 7 2
      packages/extra/forms/demo/goodies.pp
  25. 7 2
      packages/extra/forms/demo/group.pp
  26. 6 1
      packages/extra/forms/demo/iconify.pp
  27. 7 3
      packages/extra/forms/demo/inputall.pp
  28. 7 2
      packages/extra/forms/demo/invslider.pp
  29. 7 3
      packages/extra/forms/demo/lalign.pp
  30. 7 2
      packages/extra/forms/demo/ldial.pp
  31. 7 2
      packages/extra/forms/demo/ll.pp
  32. 7 2
      packages/extra/forms/demo/longlabel.pp
  33. 7 2
      packages/extra/forms/demo/menu.pp
  34. 7 2
      packages/extra/forms/demo/minput.pp
  35. 7 2
      packages/extra/forms/demo/multilabel.pp
  36. 7 2
      packages/extra/forms/demo/ndial.pp
  37. 7 3
      packages/extra/forms/demo/newbutton.pp
  38. 7 7
      packages/extra/forms/demo/objinactive.pp
  39. 10 7
      packages/extra/forms/demo/objpos.pp
  40. 7 3
      packages/extra/forms/demo/objreturn.pp
  41. 7 3
      packages/extra/forms/demo/positioner.pp
  42. 7 2
      packages/extra/forms/demo/pup.pp
  43. 7 2
      packages/extra/forms/demo/pushbutton.pp
  44. 7 3
      packages/extra/forms/demo/pushme.pp
  45. 7 2
      packages/extra/forms/demo/secretinput.pp
  46. 7 2
      packages/extra/forms/demo/sliderall.pp
  47. 6 1
      packages/extra/forms/demo/touchbutton.pp
  48. 7 3
      packages/extra/forms/demo/xyplotover.pp
  49. 7 3
      packages/extra/forms/demo/yesno.pp
  50. 6 2
      packages/extra/forms/xforms.pp

+ 1 - 1
packages/extra/forms/Makefile.fpc

@@ -7,7 +7,7 @@ name=forms
 version=1.0.8
 
 [target]
-units=forms
+units=xforms
 programs=fd2pascal
 exampledirs=demo
 

+ 10 - 7
packages/extra/forms/demo/arrowbutton.pp

@@ -1,7 +1,7 @@
 { This demo shows the use of special symbol labels }
 program arrowbutton;
 
-uses forms;
+uses xforms;
 
 const border : longint = FL_TRANSIENT;
 
@@ -37,11 +37,14 @@ begin
   fl_show_form(form,FL_PLACE_ASPECT,border,'Buttons');
   while (fl_do_forms() <> but) do;
   fl_hide_form(form);
-end.  $Log$
-end.  Revision 1.2  2002-09-07 15:42:54  peter
-end.    * old logs removed and tabs fixed
-end.
-end.  Revision 1.1  2002/01/29 17:55:00  peter
-end.    * splitted to base and extra
 end.
+
+{
+  $Log$
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
+    * old logs removed and tabs fixed
 }

+ 7 - 5
packages/extra/forms/demo/borderwidth.pp

@@ -1,6 +1,6 @@
 program borderwidth;
 
-uses forms;
+uses xforms;
 
 type TFD_bwform = record
         bwform : PFL_FORM;
@@ -99,11 +99,13 @@ begin
    fl_show_form(fd_bwform^.bwform,FL_PLACE_CENTER,FL_NOBORDER,'bwform');
    while (fl_do_forms<>nil) do;
 end.
-
-
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 7
packages/extra/forms/demo/boxtype.pp

@@ -3,7 +3,7 @@
  }
 program boxtype;
 
-uses forms;
+uses xforms;
 
 const border = FL_TRANSIENT;
 
@@ -219,11 +219,11 @@ begin
   fl_set_choice (modeob, fl_vmode+1);
    fl_show_form (form, FL_PLACE_MOUSE, border, 'Box types');
   while (fl_do_forms <> exitob) do;
-end.  $Log$
-end.  Revision 1.2  2002-09-07 15:42:54  peter
-end.    * old logs removed and tabs fixed
-end.
-end.  Revision 1.1  2002/01/29 17:55:00  peter
-end.    * splitted to base and extra
 end.
+{
+  $Log$
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
 }

+ 7 - 2
packages/extra/forms/demo/browserall.pp

@@ -1,7 +1,7 @@
 { This is a demo that shows the different types of browsers.  }
 
 
-uses forms,strings;
+uses xforms,strings;
 
 var
 form : PFL_FORM;
@@ -176,8 +176,13 @@ begin
   fl_do_forms;
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/browserop.pp

@@ -1,7 +1,7 @@
 { This demo shows the different routines on browsers }
 program browserop;
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -87,8 +87,13 @@ begin
   until obj = exitobj;
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/buttonall.pp

@@ -1,6 +1,6 @@
 program buttonall;
 
-uses forms;
+uses xforms;
 
 type TFD_buttform = record
         buttform : PFL_FORM;
@@ -110,8 +110,13 @@ begin
    fl_show_form(fd_buttform^.buttform,FL_PLACE_CENTER,FL_FULLBORDER,'buttform');
    while (fl_do_forms<>nil) do ;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 6 - 1
packages/extra/forms/demo/butttypes.pp

@@ -93,8 +93,13 @@ begin
    fl_show_form(fd_form0^.form0,FL_PLACE_CENTER,FL_FULLBORDER,'form0');
    fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 3
packages/extra/forms/demo/canvas.pp

@@ -1,7 +1,7 @@
 { Demo showing the use of canvas object.   V0.75
  }
 
-uses forms,x,xlib;
+uses xforms,x,xlib;
 
 {*** Forms and Objects ***}
 
@@ -240,9 +240,13 @@ begin
 
    while (fl_do_forms() <> fd_canvasform^.done) do  ;
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/chartall.pp

@@ -2,7 +2,7 @@ program chartall;
 { Showing all different charts }
 
 { Form definition file generated with fdesign. }
-uses forms;
+uses xforms;
 
 var
   form : PFL_FORM;
@@ -80,8 +80,13 @@ begin
   fl_show_form(form,FL_PLACE_CENTER,FL_TRANSIENT,'Charts');
   fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/chartstrip.pp

@@ -1,7 +1,7 @@
 { A demo of a moving chart }
 program chartstrip;
 
-uses forms,xlib;
+uses xforms,xlib;
 
 var
  func : longint;
@@ -119,8 +119,13 @@ begin
     obj := fl_check_forms();
   until obj = exitbut;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/choice.pp

@@ -2,7 +2,7 @@
 
 program choice;
 
-uses forms;
+uses xforms;
 
 
 var form : PFL_FORM;
@@ -50,8 +50,13 @@ begin
   while (obj <> readyobj) do obj := fl_do_forms;
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 2
packages/extra/forms/demo/colbrowser.pp

@@ -1,6 +1,6 @@
 Program colbrowser;
 
-uses forms,strings;
+uses xforms,strings;
 
 Const  MAX_RGB = 3000;
 
@@ -279,8 +279,13 @@ begin
 
     while (fl_do_forms()<>nil) do;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 7
packages/extra/forms/demo/colsel.pp

@@ -1,15 +1,15 @@
 program colsel;
 
-uses forms;
+uses xforms;
 
 begin
    fl_initialize(@argc, argv, 'FormDemo', nil, 0);
    fl_show_colormap(0);
-end.  $Log$
-end.  Revision 1.2  2002-09-07 15:42:55  peter
-end.    * old logs removed and tabs fixed
-end.
-end.  Revision 1.1  2002/01/29 17:55:00  peter
-end.    * splitted to base and extra
 end.
+{
+  $Log$
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
 }

+ 7 - 2
packages/extra/forms/demo/colsel1.pp

@@ -1,6 +1,6 @@
 program colsel1;
 
-uses forms;
+uses xforms;
 
 var form : PFL_FORM;
     topbox : PFL_OBJECT;
@@ -45,8 +45,13 @@ begin
   while ret<>topbox do ret := fl_do_forms();
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 3
packages/extra/forms/demo/counter.pp

@@ -2,7 +2,7 @@
 }
 program counter;
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -69,9 +69,13 @@ begin
   fl_do_forms();
 
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:00  peter

+ 7 - 3
packages/extra/forms/demo/cursor.pp

@@ -2,7 +2,7 @@ Program cursor;
 
 { Cursor routines demo. }
 
-uses forms;
+uses xforms;
 
 {$i bm1.xbm}
 {$i bm2.xbm}
@@ -87,9 +87,13 @@ Begin
    fl_show_form(fd_cursor^.cursor,FL_PLACE_CENTER,FL_FULLBORDER,'cursor');
    fl_do_forms;
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/fbrowse.pp

@@ -2,7 +2,7 @@
 }
 program fbrowse;
 
-uses forms,strings;
+uses xforms,strings;
 
 var
 form : PFL_FORM;
@@ -82,8 +82,13 @@ begin
   fl_hide_form(form);
   fl_free_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/fbrowse1.pp

@@ -1,7 +1,7 @@
 { This demo shows the use of a browser and fl_call_object_callback.  }
 program fbrowse1;
 
-uses forms;
+uses xforms;
 
 var
   form : PFL_FORM;
@@ -52,8 +52,13 @@ begin
   until obj = but;
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/fdial.pp

@@ -3,7 +3,7 @@
  }
 Program fdial;
 
-uses forms;
+uses xforms;
 
 var
 form: PFL_FORM;
@@ -70,8 +70,13 @@ begin
   until (ret = button);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/flclock.pp

@@ -1,7 +1,7 @@
 { Form definition file generated with fdesign. }
 program flclock;
 
-uses forms;
+uses xforms;
 
 var
  fclock : PFL_FORM;
@@ -45,8 +45,13 @@ begin
     fl_show_form(fclock, FL_PLACE_CENTER,FL_TRANSIENT,'clocks');
     fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:55  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:55  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/fonts.pp

@@ -1,7 +1,7 @@
 {* Demo, showing ther different fonts in the different sizes. *}
 program fonts;
 
-uses forms;
+uses xforms;
 
 type
 TFD_fontsform = record
@@ -105,8 +105,13 @@ begin
   fl_show_form(ui^.fontsform,FL_PLACE_CENTER,FL_TRANSIENT,'Fonts');
   fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/free1.pp

@@ -3,7 +3,7 @@
 }
 program free1;
 
-uses forms;
+uses xforms;
 
 Const
   onn : boolean = True;
@@ -82,8 +82,13 @@ begin
   fl_show_form(form,FL_PLACE_CENTER,FL_NOBORDER,'Free Object');
   fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/goodies.pp

@@ -5,7 +5,7 @@ Program goodies;
    forms in an even easier way.
 }
 
-uses forms,strings;
+uses xforms,strings;
 
 var
   choice : Longint;
@@ -47,8 +47,13 @@ begin
   fl_show_message('You typed:','',s);
   fl_show_messages('Good Bye');
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/group.pp

@@ -1,6 +1,6 @@
 program group;
 
-uses forms;
+uses xforms;
 
 {$i porsche.xpm}
 {$i nomail.xbm}
@@ -224,8 +224,13 @@ begin
      begin
      end;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 6 - 1
packages/extra/forms/demo/iconify.pp

@@ -35,8 +35,13 @@ begin
    fl_show_form(form0,FL_PLACE_CENTER,FL_FULLBORDER, 'IconTest');
    fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 3
packages/extra/forms/demo/inputall.pp

@@ -1,6 +1,6 @@
 program inputall;
 
-uses forms;
+uses xforms;
 
 type TFD_INPUT = record
         input : PFL_FORM;
@@ -95,9 +95,13 @@ begin
    fl_show_form(fd_input^.input,FL_PLACE_CENTERFREE,FL_FULLBORDER,'input');
    while (fl_do_forms<>nil) do;
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/invslider.pp

@@ -1,6 +1,6 @@
 program invslider;
 
-uses forms;
+uses xforms;
 
 type
 TFD_inv = record
@@ -65,8 +65,13 @@ begin
    fl_show_form(ui^.inv,FL_PLACE_CENTER,FL_TRANSIENT,'inv');
    while fl_do_forms <> ui^.done do;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 3
packages/extra/forms/demo/lalign.pp

@@ -1,7 +1,7 @@
 program lalign;
 
 { different label alignments }
-uses forms;
+uses xforms;
 
 type
 TFD_Form0 = record
@@ -100,9 +100,13 @@ begin
    fl_show_form(fd_form0^.form0,FL_PLACE_FREE,FL_FULLBORDER,'form0');
    fl_do_forms();
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/ldial.pp

@@ -2,7 +2,7 @@
 }
 Program ldial;
 
-uses forms;
+uses xforms;
 
 
 var
@@ -62,8 +62,13 @@ begin
   until (ret = button);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/ll.pp

@@ -1,6 +1,6 @@
 program ll;
 
-uses forms;
+uses xforms;
 
 {*** Forms and Objects ***}
 
@@ -139,8 +139,13 @@ begin
    fl_show_form(xypui^.axypform,FL_PLACE_MOUSE,FL_TRANSIENT,'axypform');
    fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/longlabel.pp

@@ -1,7 +1,7 @@
 { Demo of the Use of a very long label }
 program longlabel;
 
-uses forms;
+uses xforms;
 
 Const
 label1 : pchar = 'This demo shows the use of some very'#10+
@@ -56,8 +56,13 @@ begin
   fl_set_object_label(but,'Quit');
   fl_do_forms();
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/menu.pp

@@ -7,7 +7,7 @@
  }
 program menudemo;
 
-uses forms;
+uses xforms;
 
 Var menu,abox : array[0..3] of PFL_OBJECT;
     isset : array[0..3] of longint;
@@ -119,8 +119,13 @@ begin
   fl_do_forms();
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/minput.pp

@@ -1,6 +1,6 @@
 program minput;
 
-uses forms;
+uses xforms;
 
 procedure input_cb( ob : PFL_OBJECT; data : Longint);export;
 
@@ -27,8 +27,13 @@ begin
   fl_show_form(form,FL_PLACE_CENTERFREE,FL_FULLBORDER,'MultiLineInput');
   while (obj <> but) do obj:=fl_do_forms;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/multilabel.pp

@@ -1,7 +1,7 @@
 { Multiline labels. }
 program multilabel;
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -50,8 +50,13 @@ begin
   until (obj = readyobj);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/ndial.pp

@@ -1,6 +1,6 @@
 { This is an example of the use of dials.  }
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -61,8 +61,13 @@ begin
   until (ret = button);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 3
packages/extra/forms/demo/newbutton.pp

@@ -5,7 +5,7 @@
  * changed stub button to crossbutton
  }
 
-uses forms;
+uses xforms;
 
 Const FL_CROSSBUTTON=2000;
       FL_CROSSBUTTON_BW = 2;
@@ -149,9 +149,13 @@ begin
       fl_show_form(cbform^.newbut, FL_PLACE_CENTER, 0, nil);
       while(fl_do_forms <> cbform^.bexit) do ;
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 7
packages/extra/forms/demo/objinactive.pp

@@ -2,7 +2,7 @@
 }
 program objin;
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -109,11 +109,11 @@ begin
   fl_show_form(form,FL_PLACE_CENTER,FL_NOBORDER,NiL);
   while (fl_do_forms()<>nil) do
     begin end;
-end.  $Log$
-end.  Revision 1.2  2002-09-07 15:42:57  peter
-end.    * old logs removed and tabs fixed
-end.
-end.  Revision 1.1  2002/01/29 17:55:01  peter
-end.    * splitted to base and extra
 end.
+{
+  $Log$
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
 }

+ 10 - 7
packages/extra/forms/demo/objpos.pp

@@ -1,6 +1,6 @@
 program objpos;
 
-uses forms;
+uses xforms;
 
 const
   dx : TFL_Coord = 11 ;
@@ -43,11 +43,14 @@ begin
 
   fl_do_forms();
 
-end.  $Log$
-end.  Revision 1.2  2002-09-07 15:42:57  peter
-end.    * old logs removed and tabs fixed
-end.
-end.  Revision 1.1  2002/01/29 17:55:01  peter
-end.    * splitted to base and extra
 end.
+{
+  $Log$
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
+    * old logs removed and tabs fixed
+
 }

+ 7 - 3
packages/extra/forms/demo/objreturn.pp

@@ -4,7 +4,7 @@
  }
 program objreturn;
 
-uses forms;
+uses xforms;
 
 
 {*** Forms and Objects ***}
@@ -119,9 +119,13 @@ begin
     fl_do_forms();
 end.
 
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 3
packages/extra/forms/demo/positioner.pp

@@ -1,7 +1,7 @@
 { This demo shows the use of a positioner.  }
 program positioner;
 
-uses forms;
+uses xforms;
 
 var
  xval, yval : PFL_Object;
@@ -53,9 +53,13 @@ begin
   fl_do_forms;
   fl_hide_form(form);
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:01  peter

+ 7 - 2
packages/extra/forms/demo/pup.pp

@@ -4,7 +4,7 @@
  }
 program popup;
 
-uses forms,strings;
+uses xforms,strings;
 
 var
 pup : PFL_FORM;
@@ -234,8 +234,13 @@ begin
 
     fl_do_forms;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 2
packages/extra/forms/demo/pushbutton.pp

@@ -1,7 +1,7 @@
 Program pushButtons;
 { A demo that shows the use of push buttons.  }
 
-uses forms;
+uses xforms;
 
 var form : PFL_FORM;
     Abox : array[0..8] of PFL_OBJECT;
@@ -43,8 +43,13 @@ Begin
   { fl_do_forms will return only when Exit is pressed }
   fl_do_forms;
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 3
packages/extra/forms/demo/pushme.pp

@@ -1,6 +1,6 @@
 Program pushme;
 
-uses forms;
+uses xforms;
 
 var simpleform : PFL_FORM;
 {    formname,buttonname : string;
@@ -14,9 +14,13 @@ begin
   fl_do_forms;
   fl_hide_form(simpleform);
 end.
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 2
packages/extra/forms/demo/secretinput.pp

@@ -1,7 +1,7 @@
 program secretinput;
 { Demo showing secret input fields }
 
-uses forms,strings;
+uses xforms,strings;
 
 var form : PFL_FORM;
    but, password1, password2, info, ret : PFL_OBJECT;
@@ -27,8 +27,13 @@ begin
   until (ret = but);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 2
packages/extra/forms/demo/sliderall.pp

@@ -2,7 +2,7 @@
 
 program sliderall;
 
-uses forms;
+uses xforms;
 
 var
 form : PFL_FORM;
@@ -73,8 +73,13 @@ begin
   until  (obj = exitobj);
   fl_hide_form(form);
 end.
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 6 - 1
packages/extra/forms/demo/touchbutton.pp

@@ -52,8 +52,13 @@ begin
   fl_do_forms();
 end.
 
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 3
packages/extra/forms/demo/xyplotover.pp

@@ -1,7 +1,7 @@
 { Demo showing the use of xyplot overlay. }
 program xyplotover;
 
-uses forms;
+uses xforms;
 
 {*** Forms and Objects ***}
 
@@ -68,9 +68,13 @@ begin
    fl_do_forms();
 end.
 
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 7 - 3
packages/extra/forms/demo/yesno.pp

@@ -4,7 +4,7 @@ Program yesno;
    are very usefull for asking questions
 }
 
-Uses forms;
+Uses xforms;
 
 var
     form   : PFL_FORM;
@@ -22,9 +22,13 @@ begin
   fl_hide_form(form);
 end.
 
-
+{
   $Log$
-  Revision 1.2  2002-09-07 15:42:57  peter
+  Revision 1.3  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:57  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:55:02  peter

+ 6 - 2
packages/extra/forms/forms.pp → packages/extra/forms/xforms.pp

@@ -1,7 +1,7 @@
 {
   $Id$
 }
-Unit forms;
+Unit xforms;
 Interface
 
 {$linklib forms}
@@ -2910,7 +2910,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2002-09-07 15:42:54  peter
+  Revision 1.1  2003-10-27 15:48:13  peter
+    * renamed forms unit to xforms to prevent conflict with Forms
+      from the LCL
+
+  Revision 1.2  2002/09/07 15:42:54  peter
     * old logs removed and tabs fixed
 
   Revision 1.1  2002/01/29 17:54:59  peter