* FVISION define to compile with fvision units

ide/fpcalc.pas

@@ -19,7 +19,12 @@ unit FPCalc;
 interface
 
 uses
-  Drivers,Objects,Commands,Views,Dialogs,App,
+  Drivers,Objects,Views,Dialogs,App,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,
+{$endif}
   WViews,
   FPViews;
 
@@ -463,7 +468,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:22  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:22  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.1  2000/11/13 16:59:08  pierre

ide/fpcatch.pas

@@ -54,7 +54,12 @@ uses
   keyboard,
   drivers,
 {$endif FPC}
-  dos,app,commands,msgbox,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,
+{$endif}
+  dos,app,msgbox,
   FPString,FPCompil,FPIDE;
 
 Const
@@ -190,7 +195,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:22  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:22  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.4  2000/11/30 13:04:01  pierre

ide/fpcodcmp.pas

@@ -35,7 +35,12 @@ procedure RegisterCodeComplete;
 
 implementation
 
-uses Commands,Views,Dialogs,MsgBox,
+uses Views,Dialogs,MsgBox,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
      WEditor,
      FPConst,FPString,FPViews;
 

ide/fpcodtmp.pas

@@ -74,7 +74,12 @@ procedure RegisterCodeTemplates;
 
 implementation
 
-uses Commands,Views,App,
+uses Views,App,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
      FPConst,FPString;
 
 {$ifndef NOOBJREG}

ide/fpcompil.pas

@@ -149,7 +149,12 @@ uses
   signals,
 {$endif}
   Dos,Video,
-  StdDlg,App,Commands,tokens,
+  StdDlg,App,tokens,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,
+{$endif}
   CompHook, Compiler, systems, browcol,
   WEditor,
   FPString,FPRedir,FPDesk,
@@ -712,7 +717,7 @@ begin
       CompilerStatusDialog^.Update;
 {$ifdef DEBUG}
  {$ifndef NODEBUG}
-     def_gdb_stop(level);
+//     def_gdb_stop(level);
  {$endif}
 {$endif DEBUG}
 {$ifdef redircompiler}
@@ -1226,7 +1231,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:22  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:22  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.24  2001/06/07 16:41:12  jonas

ide/fpconst.pas

@@ -17,7 +17,12 @@ unit FPConst;
 
 interface
 
-uses Views,App,Commands,
+uses Views,App,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
      WViews,WEditor,WHTMLHlp;
 
 const
@@ -428,7 +433,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.12  2001/03/12 17:34:54  pierre

ide/fpdebug.pas

@@ -366,7 +366,12 @@ implementation
 
 uses
   Dos,Video,
-  App,Commands,Strings,HelpCtx,
+  App,Strings,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,HelpCtx,
+{$endif}
 {$ifdef win32}
   Windebug,
 {$endif win32}
@@ -3861,7 +3866,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.35  2001/08/03 13:33:51  pierre

ide/fphelp.pas

@@ -18,13 +18,14 @@ unit FPHelp;
 interface
 
 uses
-  Drivers,HelpCtx,
-  WHelp,WHlpView,WHTML,
-{$ifdef EDITORS}
-  Editors,
+  Drivers,
+{$ifdef FVISION}
+  FVConsts,
 {$else}
-  WEditor,WCEdit,
+  Commands,HelpCtx,
 {$endif}
+  WHelp,WHlpView,WHTML,
+  WEditor,WCEdit,
   WViews,WHTMLScn,
   FPViews;
 
@@ -65,7 +66,7 @@ const
 
 implementation
 
-uses Objects,Views,App,MsgBox,Commands,
+uses Objects,Views,App,MsgBox,
      WUtils,WOAHelp,WHTMLHlp,WNGHelp,WOS2Help,WVPHelp,WWinHelp,
      FPString,FPConst,FPVars,FPUtils;
 
@@ -503,7 +504,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.7  2001/03/12 17:34:55  pierre

ide/fpide.pas

@@ -159,7 +159,12 @@ uses
   FpDpAnsi,WConsts,
   Video,Mouse,Keyboard,
   Compiler,Version,
-  Dos,Memory,Menus,Dialogs,StdDlg,ColorSel,Commands,HelpCtx,
+  Dos,Memory,Menus,Dialogs,StdDlg,ColorSel,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,HelpCtx,
+{$endif}
   Systems,
   WUtils,WHlpView,WViews,WHTMLHlp,
   FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompil,FPHelp,
@@ -1150,7 +1155,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:47  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.30  2001/06/14 09:15:48  pierre

ide/fpini.pas

@@ -29,7 +29,12 @@ function  WriteINIFile(FromSaveAs : boolean) : boolean;
 implementation
 
 uses
-  Dos,Objects,Drivers,Commands,
+  Dos,Objects,Drivers,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,
+{$endif}
   Version,
 {$ifdef USE_EXTERNAL_COMPILER}
    fpintf, { superseeds version_string of version unit }
@@ -617,7 +622,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.8  2001/03/08 16:39:22  pierre

ide/fpkeys.pas

@@ -53,7 +53,11 @@ Procedure SetKnownKeys;
 implementation
 
 uses
+{$ifdef FVISION}
+  FVConsts,
+{$else}
   Commands,
+{$endif}
   WUtils;
 
 {$ifndef NotUseTree}
@@ -338,7 +342,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:23  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:23  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.10  2001/03/27 14:22:44  pierre

ide/fpsymbol.pas

@@ -219,7 +219,12 @@ const
 
 implementation
 
-uses Commands,App,Strings,
+uses App,Strings,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
 {$ifdef BROWSERCOL}
      symconst,
 {$endif BROWSERCOL}
@@ -1784,7 +1789,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:24  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:24  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.7  2001/04/06 22:13:38  pierre

ide/fptemplt.pas

@@ -36,13 +36,14 @@ implementation
 
 uses
   Dos,Objects,
-  Commands,MsgBox,
-  WUtils,
-{$ifdef EDITORS}
-  Editors,
+{$ifdef FVISION}
+  FVConsts,
 {$else}
-  WEditor,
+  Commands,
 {$endif}
+  MsgBox,
+  WUtils,
+  WEditor,
   FPConst,FPVars,FPString,FPUtils;
 
 type
@@ -289,7 +290,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:24  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:24  peter
     * ide works now with both compiler versions
 
   Revision 1.1  2000/07/13 09:48:36  michael

ide/fptools.pas

@@ -153,7 +153,12 @@ procedure RegisterFPTools;
 implementation
 
 uses Dos,
-     Commands,App,MsgBox,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
+     App,MsgBox,
      WConsts,WUtils,WINI,WEditor,
      FPConst,FPString,FPVars,FPUtils;
 
@@ -1590,7 +1595,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:24  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:24  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.5  2001/03/20 00:20:42  pierre

ide/fpviews.pas

@@ -20,21 +20,22 @@ unit FPViews;
 interface
 
 uses
-  Dos,Objects,Drivers,Commands,HelpCtx,Views,Menus,Dialogs,App,Gadgets,
-  ASCIITAB,
-{$ifdef EDITORS}
-  Editors,
+  Dos,Objects,Drivers,
+{$ifdef FVISION}
+  FVConsts,
 {$else}
-  WEditor,WCEdit,
+  Commands,HelpCtx,
 {$endif}
+  Views,Menus,Dialogs,App,Gadgets,
+  ASCIITAB,
+  WEditor,WCEdit,
   WUtils,WHelp,WHlpView,WViews,WANSI,
   Comphook,
   FPConst,FPUsrScr;
 
 type
-{$IFNDEF EDITORS}
-    TEditor = TCodeEditor; PEditor = PCodeEditor;
-{$ENDIF}
+    TEditor = TCodeEditor;
+    PEditor = PCodeEditor;
 
     PStoreCollection = ^TStoreCollection;
     TStoreCollection = object(TStringCollection)
@@ -130,7 +131,6 @@ type
           PScrollBar; AIndicator: PIndicator;const AFileName: string);
     public
       CompileStamp : longint;
-{$ifndef EDITORS}
     public
       CodeCompleteTip: PFPToolTip;
       { Syntax highlight }
@@ -145,7 +145,6 @@ type
       function    CompleteCodeWord(const WordS: string; var Text: string): boolean; virtual;
       procedure   SetCodeCompleteWord(const S: string); virtual;
       procedure   AlignCodeCompleteTip;
-{$endif}
       procedure   HandleEvent(var Event: TEvent); virtual;
 {$ifdef DebugUndo}
       procedure   DumpUndo;
@@ -758,14 +757,10 @@ const AlphaNum : set of char = ['A'..'Z','0'..'9','_'];
 begin
   with Editor^ do
   begin
-{$ifdef EDITORS}
-    S:='';
-{$else}
     S:=GetDisplayText(CurPos.Y);
     PS:=CurPos.X; while (PS>0) and (Upcase(S[PS]) in AlphaNum) do Dec(PS);
     PE:=CurPos.X; while (PE<length(S)) and (Upcase(S[PE+1]) in (AlphaNum+ValidSpecChars)) do Inc(PE);
     S:=Trim(copy(S,PS+1,PE-PS));
-{$endif}
   end;
   GetEditorCurWord:=S;
 end;
@@ -1078,8 +1073,6 @@ end;
                                SourceEditor
 *****************************************************************************}
 
-{$ifndef EDITORS}
-
 function SearchCoreForFileName(const AFileName: string): PCodeEditorCore;
 var EC: PCodeEditorCore;
 function Check(P: PView): boolean; {$ifndef FPC}far;{$endif}
@@ -1249,8 +1242,6 @@ begin
     CodeCompleteTip^.Show;
 end;
 
-{$endif EDITORS}
-
 procedure TSourceEditor.ModifiedChanged;
 begin
   inherited ModifiedChanged;
@@ -1724,7 +1715,11 @@ procedure TSourceWindow.SetTitle(ATitle: string);
 begin
   if Title<>nil then DisposeStr(Title);
   Title:=NewStr(ATitle);
+{$ifdef FVISION}
+  DrawBorder;
+{$else}
   Frame^.DrawView;
+{$endif}
 end;
 
 procedure TSourceWindow.HandleEvent(var Event: TEvent);
@@ -3165,10 +3160,10 @@ begin
   if InDraw then Exit;
   InDraw:=true;
   { - Start of TGroup.Draw - }
-  if Buffer = nil then
+{  if Buffer = nil then
   begin
     GetBuffer;
-  end;
+  end; }
   { - Start of TGroup.Draw - }
 
   C1:=GetColor(1); C2:=(GetColor(7) and $f0 or $08)+GetColor(9)*256; C3:=GetColor(8)+GetColor({9}8)*256;
@@ -4166,7 +4161,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:24  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:24  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.34  2001/07/30 20:31:25  pierre

ide/wcedit.pas

@@ -260,7 +260,13 @@ procedure RegisterWCEdit;
 implementation
 
 uses Dos,
-     WConsts,Commands,App,WViews;
+     WConsts,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
+     App,WViews;
 
 {$ifndef NOOBJREG}
 const
@@ -1960,7 +1966,10 @@ end;
 END.
 {
  $Log$
- Revision 1.1  2001-08-04 11:30:25  peter
+ Revision 1.2  2001-08-05 02:01:48  peter
+   * FVISION define to compile with fvision units
+
+ Revision 1.1  2001/08/04 11:30:25  peter
    * ide works now with both compiler versions
 
  Revision 1.1.2.20  2001/06/07 16:41:12  jonas

ide/weditor.pas

@@ -19,7 +19,12 @@ unit WEditor;
 interface
 {tes}
 uses
-  Dos,Objects,Drivers,Views,Menus,Commands,
+  Dos,Objects,Drivers,Views,Menus,
+{$ifdef FVISION}
+  FVConsts,
+{$else}
+  Commands,
+{$endif}
   WUtils;
 
 const
@@ -6863,7 +6868,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:25  peter
+  Revision 1.2  2001-08-05 02:01:48  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:25  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.37  2001/08/03 11:43:58  pierre

ide/whlpview.pas

@@ -18,12 +18,13 @@ unit WHlpView;
 interface
 
 uses
-  Objects,Drivers,Commands,Views,
-{$ifdef EDITORS}
-  Editors,
+  Objects,Drivers,Views,
+{$ifdef FVISION}
+  FVConsts,
 {$else}
-  WEditor,WCEdit,
+  Commands,
 {$endif}
+  WEditor,WCEdit,
   WUtils,WHelp;
 
 {$IFNDEF EDITORS}
@@ -1348,7 +1349,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:25  peter
+  Revision 1.2  2001-08-05 02:01:49  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:25  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.5  2001/03/20 00:20:44  pierre

ide/wutils.pas

@@ -31,9 +31,6 @@ uses
     unix,
   {$endif}
 {$endif Unix}
-{$ifdef FVISION}
-  Common,
-{$endif FVISION}
   Dos,Objects;
 
 const
@@ -1223,7 +1220,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-08-05 02:01:49  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.14  2001/06/20 22:56:31  pierre

ide/wviews.pas

@@ -256,7 +256,13 @@ procedure RegisterWViews;
 implementation
 
 uses Mouse,
-     Resource,Commands,App,MsgBox,StdDlg,
+     Resource,
+{$ifdef FVISION}
+     FVConsts,
+{$else}
+     Commands,
+{$endif}
+     App,MsgBox,StdDlg,
      WConsts,WUtils;
 
 {$ifndef NOOBJREG}
@@ -2483,7 +2489,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.1  2001-08-04 11:30:26  peter
+  Revision 1.2  2001-08-05 02:01:49  peter
+    * FVISION define to compile with fvision units
+
+  Revision 1.1  2001/08/04 11:30:26  peter
     * ide works now with both compiler versions
 
   Revision 1.1.2.8  2001/03/20 00:13:54  pierre