瀏覽代碼

* Breakpoints are now deleted when removed from source, disabling is
still possible from the breakpoint list
* COMPILER_1_0, FVISION, GABOR defines removed, only support new
FV and 1.9.x compilers
* Run directory added to Run menu
* Useless programinfo window removed

peter 21 年之前
父節點
當前提交
4a8f1e918d
共有 32 個文件被更改,包括 452 次插入698 次删除
  1. 7 36
      fv/stddlg.pas
  2. 14 15
      ide/fp.pas
  3. 9 5
      ide/fpcalc.pas
  4. 9 9
      ide/fpcatch.pas
  5. 9 5
      ide/fpcodcmp.pas
  6. 9 5
      ide/fpcodtmp.pas
  7. 22 78
      ide/fpcompil.pas
  8. 12 7
      ide/fpconst.pas
  9. 40 47
      ide/fpdebug.pas
  10. 9 18
      ide/fpdesk.pas
  11. 9 6
      ide/fphelp.pas
  12. 17 28
      ide/fpide.pas
  13. 14 15
      ide/fpini.pas
  14. 26 34
      ide/fpintf.pas
  15. 9 5
      ide/fpkeys.pas
  16. 9 17
      ide/fpmcomp.inc
  17. 12 2
      ide/fpmfile.inc
  18. 14 6
      ide/fpmopts.inc
  19. 30 7
      ide/fpmrun.inc
  20. 9 2
      ide/fpmwnd.inc
  21. 11 1
      ide/fpstre.inc
  22. 29 30
      ide/fpsymbol.pas
  23. 9 5
      ide/fptemplt.pas
  24. 11 7
      ide/fptools.pas
  25. 9 3
      ide/fpusrscr.pas
  26. 30 23
      ide/fpvars.pas
  27. 17 153
      ide/fpviews.pas
  28. 1 14
      ide/globdir.inc
  29. 9 5
      ide/wcedit.pas
  30. 16 88
      ide/weditor.pas
  31. 11 16
      ide/whlpview.pas
  32. 10 6
      ide/wviews.pas

+ 7 - 36
fv/stddlg.pas

@@ -64,23 +64,17 @@ uses
   FVConsts, Objects, Drivers, Views, Dialogs, Validate, Dos;
 
 const
-{$ifdef PPC_FPC}
   MaxDir   = 255;   { Maximum length of a DirStr. }
   MaxFName = 255; { Maximum length of a FNameStr. }
 
-  {$ifdef OS_Unix}
-  DirSeparator : Char = '/';
-  {$else}
-  DirSeparator : Char = '\';
-  {$endif}
+  DirSeparator : Char = system.DirectorySeparator;
 
+{$ifdef Unix}
+  AllFiles = '*';
 {$else}
-  MaxDir = 67;   { Maximum length of a DirStr. }
-  MaxFName = 79; { Maximum length of a FNameStr. }
-  DirSeparator: Char = '\';
+  AllFiles = '*.*';
 {$endif}
 
-
 type
   { TSearchRec }
 
@@ -95,11 +89,7 @@ type
     Attr: Longint;
     Time: Longint;
     Size: Longint;
-{$ifdef PPC_FPC}
-    Name: string[255];
-{$else not PPC_FPC}
-    Name: string[12];
-{$endif not PPC_FPC}
+    Name: string[MaxFName];
   end;
   PSearchRec = ^TSearchRec;
 
@@ -985,11 +975,6 @@ end;
 procedure TFileList.ReadDirectory(AWildCard: PathStr);
 const
   FindAttr = ReadOnly + Archive;
-{$ifdef Unix}
-  AllFiles = '*';
-{$else}
-  AllFiles = '*.*';
-{$endif}
   PrevDir  = '..';
 var
   S: SearchRec;
@@ -1873,16 +1858,12 @@ begin
     end;
     NewCur := AList^.Count-1;
     isFirst := True;
-    NewDir := Dirct + '*.*';
+    NewDir := Dirct + AllFiles;
     FindFirst(NewDir, Directory, SR);
     while DosError = 0 do
     begin
       if (SR.Attr and Directory <> 0) and
-{$ifdef FPC}
          (SR.Name <> '.') and (SR.Name <> '..') then
-{$else : not FPC}
-         (SR.Name[1] <> '.') then
-{$endif not FPC}
       begin
    if isFirst then
    begin
@@ -1893,9 +1874,7 @@ begin
       end;
       FindNext(SR);
     end;
- {$ifdef fpc}
   FindClose(SR);
- {$endif}
     P := PDirEntry(AList^.At(AList^.Count-1))^.DisplayText;
     I := Pos('À',P^);
     if I = 0 then
@@ -1937,7 +1916,7 @@ begin
   Options := Options or ofCentered;
 
   R.Assign(3, 3, 30, 4);
-  DirInput := New(PInputLine, Init(R, 68));
+  DirInput := New(PInputLine, Init(R, FileNameLen+4));
   Insert(DirInput);
   R.Assign(2, 2, 17, 3);
   Control := New(PLabel, Init(R,labels^.get(slDirectoryName), DirInput));
@@ -2620,13 +2599,9 @@ var
   Dlg : PFileDialog;
 begin
   SaveAs := False;
-  {$ifdef cdResource}
-  Dlg := PFileDialog(RezFile^.Get(reSaveAsDlg));
-  {$else}
   Dlg := New(PFileDialog,Init('*.*',strings^.get(sSaveAs),
         labels^.get(slSaveAs),
         fdOkButton or fdHelpButton,0));
-  {$endif cdResource}
     { this might not work }
   PHistory(Dlg^.FileName^.Next^.Next)^.HistoryID := HistoryID;
   Dlg^.HelpCtx := hcSaveAs;
@@ -2648,11 +2623,7 @@ begin
   GetDir(0,Dir);
   {$I+}
   Rec := FExpand(ADir);
-  {$ifdef cdResource}
-  Dlg := PEditChDirDialog(RezFile^.Get(reEditChDirDialog));
-  {$else}
   Dlg := New(PEditChDirDialog,Init(cdHelpButton,HistoryID));
-  {$endif cdResource}
   if (Application^.ExecuteDialog(Dlg,@Rec) = cmOk) then
   begin
     SelectDir := True;

+ 14 - 15
ide/fp.pas

@@ -59,17 +59,13 @@ uses
 {$ifndef NODEBUG}
   gdbint,
 {$endif NODEBUG}
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   Drivers,Views,App,Dialogs,HistList,
   Menus,StdDlg,Validate,
-  {$ifdef EDITORS}Editors{$else}WEditor,WCEdit{$endif},
-{$ifndef FVISION}
+  WEditor,WCEdit,
+{$ifdef COLORSEL}
   ColorSel,
-{$endif FVISION}
+{$endif COLORSEL}
   ASCIITab,
   WUtils,WViews,WHTMLScn,WHelp,
   FPIDE,FPCalc,FPCompil,FPString,
@@ -212,7 +208,6 @@ begin
   end;
   if ErrS<>'' then
   begin
-    {$ifdef GABOR}{$ifdef TP}asm int 3;end;{$endif}{$endif}
     if Assigned(Application) then
       ErrorBox('Stream error: '+#13+ErrS,nil)
     else
@@ -236,17 +231,13 @@ begin
   RegisterApp;
   RegisterCodeComplete;
   RegisterCodeTemplates;
-{$ifndef FVISION}
+{$ifdef COLORSEL}
   RegisterColorSel;
-{$endif FVISION}
+{$endif COLORSEL}
   RegisterAsciiTab;
   RegisterDialogs;
-{$ifdef EDITORS}
-  RegisterEditors;
-{$else}
   RegisterWEditor;
   RegisterWCEdit;
-{$endif}
   RegisterFPCalc;
   RegisterFPCompile;
   RegisterFPTools;
@@ -505,7 +496,15 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.24  2004-11-05 00:21:56  peter
+  Revision 1.25  2004-11-08 20:28:25  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.24  2004/11/05 00:21:56  peter
   version info at startup
 
   Revision 1.23  2003/09/29 14:36:59  peter

+ 9 - 5
ide/fpcalc.pas

@@ -20,11 +20,7 @@ interface
 
 uses
   Drivers,Objects,Views,Dialogs,App,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   WViews,
   FPViews;
 
@@ -572,7 +568,15 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  2004-03-15 15:50:01  peter
+  Revision 1.12  2004-11-08 20:28:25  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.11  2004/03/15 15:50:01  peter
     * no cdecl for go32v2 signalhandler
 
   Revision 1.10  2004/03/09 12:08:47  marco

+ 9 - 9
ide/fpcatch.pas

@@ -53,25 +53,17 @@ procedure Generate_SIGSEGV;
 procedure Generate_SIGFPE;
 {$endif DEBUG}
 
-{$ifndef GABOR}
 var
   StopJmp : Jmp_Buf;
 const
   StopJmpValid : boolean = false;
-{$endif}
 
 Implementation
 
 uses
-{$ifdef FPC}
   keyboard,
   drivers,
-{$endif FPC}
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   dos,app,msgbox,
   FPString,FPCompil,FPIDE;
 
@@ -230,7 +222,15 @@ end.
 
 {
   $Log$
-  Revision 1.10  2004-09-15 19:23:26  hajny
+  Revision 1.11  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.10  2004/09/15 19:23:26  hajny
     * corrections for debug mode
 
   Revision 1.9  2003/09/29 14:36:59  peter

+ 9 - 5
ide/fpcodcmp.pas

@@ -63,11 +63,7 @@ procedure RegisterCodeComplete;
 implementation
 
 uses App,Views,MsgBox,Validate,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      systems, BrowCol,
      FPSwitch, FPCompil,
      FPVars, FPSymbol,
@@ -639,7 +635,15 @@ END.
 
 {
  $Log$
- Revision 1.13  2004-03-04 05:37:14  pierre
+ Revision 1.14  2004-11-08 20:28:26  peter
+   * Breakpoints are now deleted when removed from source, disabling is
+     still possible from the breakpoint list
+   * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+     FV and 1.9.x compilers
+   * Run directory added to Run menu
+   * Useless programinfo window removed
+
+ Revision 1.13  2004/03/04 05:37:14  pierre
   * fix a possibly uninitiated var
 
  Revision 1.12  2002/12/18 01:19:20  pierre

+ 9 - 5
ide/fpcodtmp.pas

@@ -93,11 +93,7 @@ procedure RegisterCodeTemplates;
 implementation
 
 uses Views,App,Validate,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      FPConst,FPString;
 
 {$ifndef NOOBJREG}
@@ -644,7 +640,15 @@ END.
 
 {
  $Log$
- Revision 1.5  2003-01-16 14:53:18  pierre
+ Revision 1.6  2004-11-08 20:28:26  peter
+   * Breakpoints are now deleted when removed from source, disabling is
+     still possible from the breakpoint list
+   * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+     FV and 1.9.x compilers
+   * Run directory added to Run menu
+   * Useless programinfo window removed
+
+ Revision 1.5  2003/01/16 14:53:18  pierre
   * avoid crash if opening empty Code Template dialog
 
  Revision 1.4  2002/09/09 06:23:02  pierre

+ 22 - 78
ide/fpcompil.pas

@@ -29,11 +29,7 @@ interface
 
 uses
   Objects,
-{$ifdef COMPILER_1_0}
-  Files,
-{$else COMPILER_1_0}
   FInput,
-{$endif COMPILER_1_0}
   Drivers,Views,Dialogs,
   WUtils,WViews,WCEdit,
   FPSymbol,
@@ -85,24 +81,9 @@ type
       procedure   Update;
     end;
 
-{$ifdef COMPILER_1_0}
-    PFPInputFile = ^TFPInputFile;
-    TFPInputFile = object(tinputfile)
-      constructor Init(AEditor: PFileEditor);
-    {$ifdef FPC}protected{$else}public{$endif}
-      function fileopen(const filename: string): boolean; virtual;
-      function fileseek(pos: longint): boolean; virtual;
-      function fileread(var databuf; maxsize: longint): longint; virtual;
-      function fileeof: boolean; virtual;
-      function fileclose: boolean; virtual;
-    private
-      Editor: PFileEditor;
-      S: PStream;
-    end;
-{$else COMPILER_1_0}
     TFPInputFile = class(tinputfile)
       constructor Create(AEditor: PFileEditor);
-    {$ifdef FPC}protected{$else}public{$endif}
+    protected
       function fileopen(const filename: string): boolean; override;
       function fileseek(pos: longint): boolean; override;
       function fileread(var databuf; maxsize: longint): longint; override;
@@ -112,7 +93,6 @@ type
       Editor: PFileEditor;
       S: PStream;
     end;
-{$endif COMPILER_1_0}
 
 const
     CompilerMessageWindow : PCompilerMessageWindow  = nil;
@@ -153,11 +133,7 @@ uses
   Video,
 {$endif fpc}
   StdDlg,App,tokens,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   CompHook, Compiler, systems, browcol,
   WEditor,
   FPString,FPRedir,FPDesk,
@@ -281,11 +257,11 @@ var
   S: string;
 begin
   case TClass and V_LevelMask of
-    V_Fatal   : ClassS:=msg_class_Fatal;  
-    V_Error   : ClassS:=msg_class_Error;  
-    V_Normal  : ClassS:=msg_class_Normal; 
+    V_Fatal   : ClassS:=msg_class_Fatal;
+    V_Error   : ClassS:=msg_class_Error;
+    V_Normal  : ClassS:=msg_class_Normal;
     V_Warning : ClassS:=msg_class_Warning;
-    V_Note    : ClassS:=msg_class_Note;   
+    V_Note    : ClassS:=msg_class_Note;
     V_Hint    : ClassS:=msg_class_Hint;
 {$ifdef VERBOSETXT}
     V_Conditional : ClassS:=msg_class_conditional;
@@ -299,7 +275,7 @@ begin
 {$endif}
     else
       ClassS:='';
-  end;  
+  end;
   if ClassS<>'' then
    ClassS:=RExpand(ClassS,0)+': ';
   if assigned(Module) and
@@ -387,11 +363,7 @@ end;
 
 procedure TCompilerMessageWindow.AddMessage(AClass: longint;const Msg, Module: string; Line, Column: longint);
 begin
-{$ifdef COMPILER_1_0}
-  if AClass>=V_Info then
-{$else}
   if (AClass and V_LineInfo)<>V_LineInfo then
-{$endif}
     Line:=0;
   MsgLB^.AddItem(New(PCompilerMessage,Init(AClass, Msg, MsgLB^.AddModuleName(Module), Line, Column)));
   if (@Self=CompilerMessageWindow) and ((AClass = V_fatal) or (AClass = V_Error)) then
@@ -660,14 +632,12 @@ const
 
 procedure CompilerStop(err: longint); {$ifndef FPC}far;{$endif}
 begin
-{$ifndef GABOR}
 {$ifdef HasSignal}
   if StopJmpValid then
     Longjmp(StopJmp,LONGJMPCALLED)
   else
     Halt(err);
 {$endif}
-{$endif}
 end;
 
 Function  CompilerGetNamedFileTime(const filename : string) : Longint; {$ifndef FPC}far;{$endif}
@@ -682,25 +652,6 @@ begin
   CompilerGetNamedFileTime:=t;
 end;
 
-{$ifdef COMPILER_1_0}
-function CompilerOpenInputFile(const filename: string): pinputfile; {$ifndef FPC}far;{$endif}
-var f: pinputfile;
-    W: PSourceWindow;
-begin
-  if assigned(CompilingHiddenFile) and
-     (NameandExtof(filename)=CompilingHiddenFile^.Editor^.Filename) then
-    W:=CompilingHiddenFile
-  else
-    W:=EditorWindowFile(FExpand(filename));
-  if Assigned(W) and (W^.Editor^.GetModified) then
-    f:=new(PFPInputFile, Init(W^.Editor))
-  else
-    f:={$ifndef GABOR}def_openinputfile(filename){$else}nil{$endif};
-  if assigned(W) then
-    W^.Editor^.CompileStamp:=CompileStamp;
-  CompilerOpenInputFile:=f;
-end;
-{$else COMPILER_1_0}
 function CompilerOpenInputFile(const filename: string): tinputfile; {$ifndef FPC}far;{$endif}
 var f: tinputfile;
     W: PSourceWindow;
@@ -713,12 +664,11 @@ begin
   if Assigned(W) and (W^.Editor^.GetModified) then
     f:=TFPInputFile.Create(W^.Editor)
   else
-    f:={$ifndef GABOR}def_openinputfile(filename){$else}nil{$endif};
+    f:=def_openinputfile(filename);
   if assigned(W) then
     W^.Editor^.CompileStamp:=CompileStamp;
   CompilerOpenInputFile:=f;
 end;
-{$endif COMPILER_1_0}
 
 function CompilerComment(Level:Longint; const s:string):boolean; {$ifndef FPC}far;{$endif}
 begin
@@ -831,11 +781,7 @@ procedure DoCompile(Mode: TCompileMode);
   end;
   function GetTargetExeExt : string;
     begin
-{$ifdef COMPILER_1_0}
-        GetTargetExeExt:=target_os.exeext;
-{$else COMPILER_1_0}
         GetTargetExeExt:=target_info.exeext;
-{$endif COMPILER_1_0}
      end;
 var
   s,FileName: string;
@@ -896,6 +842,11 @@ begin
       Application^.Insert(CompilerStatusDialog);
       CompilerStatusDialog^.Update;
     end;
+  { Restore dir that could be changed during debugging }
+  {$I-}
+   ChDir(StartUpDir);
+  {$I+}
+  EatIO;
 { hook compiler output }
   do_status:=@CompilerStatus;
   do_stop:=@CompilerStop;
@@ -918,14 +869,9 @@ begin
     FileName:='-B '+FileName;
   { tokens are created and distroed by compiler.compile !! PM }
   DoneTokens;
-{$ifdef COMPILER_1_0}
-  PPasFile:='ppas'+source_os.scriptext;
-{$else COMPILER_1_0}
   PPasFile:='ppas'+source_info.scriptext;
-{$endif COMPILER_1_0}
   WUtils.DeleteFile(GetExePath+PpasFile);
   SetStatus('Compiling...');
-{$ifndef GABOR}
 {$ifdef HasSignal}
   StoreStopJumpValid:=StopJmpValid;
   StoreStopJmp:=StopJmp;
@@ -981,7 +927,6 @@ begin
   StopJmpValid:=StoreStopJumpValid;
   StopJmp:=StoreStopJmp;
 {$endif HasSignal}
-{$endif}
   { Retrieve created exefile }
   If GetEXEPath<>'' then
     EXEFile:=FixFileName(GetEXEPath+NameOf(MainFile)+GetTargetExeExt)
@@ -1201,15 +1146,6 @@ begin
 end;
 
 
-{$ifdef COMPILER_1_0}
-constructor TFPInputFile.Init(AEditor: PFileEditor);
-begin
-  if not Assigned(AEditor) then Fail;
-  if inherited Init(AEditor^.FileName)=false then
-    Fail;
-  Editor:=AEditor;
-end;
-{$else COMPILER_1_0}
 constructor TFPInputFile.Create(AEditor: PFileEditor);
 begin
   if not Assigned(AEditor) then Fail;
@@ -1217,7 +1153,7 @@ begin
     Fail;
   Editor:=AEditor;
 end;
-{$endif COMPILER_1_0}
+
 
 function TFPInputFile.fileopen(const filename: string): boolean;
 var OK: boolean;
@@ -1296,7 +1232,15 @@ end;
 end.
 {
   $Log$
-  Revision 1.28  2004-11-06 22:02:48  peter
+  Revision 1.29  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.28  2004/11/06 22:02:48  peter
     * fixed resize helptext
 
   Revision 1.27  2004/11/06 17:22:52  peter

+ 12 - 7
ide/fpconst.pas

@@ -18,11 +18,7 @@ unit FPConst;
 interface
 
 uses Views,App,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      WViews,WEditor,WHTMLHlp;
 
 const
@@ -146,6 +142,7 @@ const
      hidCompilerArgs      = 206;
      hidWatchDialog       = 207;
      hidBreakpointDialog  = 208;
+     hidRunDir            = 209;
 
      { Command constants }
      cmShowClipboard     = 201;
@@ -161,7 +158,7 @@ const
      cmTarget            = 215;
      cmPrimaryFile       = 216;
      cmClearPrimary      = 217;
-     cmInformation       = 218;
+     cmRunDir            = 218;
 {     cmWindowList        = 219; defined in command.pas, too! - Gabor }
      cmHelpTopicSearch   = 220;
      cmMsgGotoSource     = 221;
@@ -364,6 +361,7 @@ const
      hcGlobals           = hcShift+cmGlobals;
      hcSymbol            = hcShift+cmSymbol;
      hcRun               = hcShift+cmRun;
+     hcRunDir            = hcShift+cmRunDir;
      hcParameters        = hcShift+cmParameters;
      hcResetDebugger     = hcShift+cmResetDebugger;
      hcContToCursor      = hcShift+cmContToCursor;
@@ -377,7 +375,6 @@ const
      hcTarget            = hcShift+cmTarget;
      hcPrimaryFile       = hcShift+cmPrimaryFile;
      hcClearPrimary      = hcShift+cmClearPrimary;
-     hcInformation       = hcShift+cmInformation;
      hcWindowList        = hcShift+cmWindowList;
      hcNewFromTemplate   = hcShift+cmNewFromTemplate;
      hcHelpTopicSearch   = hcShift+cmHelpTopicSearch;
@@ -474,7 +471,15 @@ implementation
 END.
 {
   $Log$
-  Revision 1.14  2004-11-05 00:21:56  peter
+  Revision 1.15  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.14  2004/11/05 00:21:56  peter
   version info at startup
 
   Revision 1.13  2003/01/22 00:27:58  pierre

+ 40 - 47
ide/fpdebug.pas

@@ -36,6 +36,7 @@ type
        editor window when debugging PM }
      CenterDebuggerRow : boolean;
      Disableallinvalidbreakpoints : boolean;
+     OrigPwd,  { pwd at startup }
      LastFileName : string;
      LastSource   : PView; {PsourceWindow !! }
      HiddenStepsCount : longint;
@@ -51,7 +52,7 @@ type
     constructor Init;
     procedure SetExe(const exefn:string);
     procedure SetWidth(AWidth : longint);
-    procedure SetDirectories;
+    procedure SetSourceDirs;
     destructor  Done;
     procedure DoSelectSourceline(const fn:string;line:longint);virtual;
 {    procedure DoStartSession;virtual;
@@ -326,11 +327,7 @@ uses
   fpusrscr,
 {$endif DOS}
   App,Strings,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,HelpCtx,
-{$endif}
 {$ifdef win32}
   Windebug,
 {$endif win32}
@@ -404,6 +401,7 @@ const
      Store:   @TWatch.Store
   );
 
+
   RBreakpointCollection: TStreamRec = (
      ObjType: 1709;
      VmtLink: Ofs(TypeOf(TBreakpointCollection)^);
@@ -418,6 +416,8 @@ const
      Store:   @TWatchesCollection.Store
   );
 
+
+
 {$ifdef I386}
 const
   FrameName = '$ebp';
@@ -542,9 +542,8 @@ begin
   HasExe:=false;
   Debugger:=@self;
   WindowWidth:=-1;
-{$ifndef GABOR}
   switch_to_user:=true;
-{$endif}
+  GetDir(0,OrigPwd);
   Command('set print object off');
 end;
 
@@ -568,7 +567,8 @@ begin
         ' (('+FrameName+' + 12)^ <> 0)');  }
 {$endif FrameNameKnown}
       SetArgs(GetRunParameters);
-      SetDirectories;
+      SetDir(GetRunDir);
+      SetSourceDirs;
       InsertBreakpoints;
       ReadWatches;
     end
@@ -585,12 +585,12 @@ begin
   Command('set width '+inttostr(WindowWidth));
 end;
 
-procedure TDebugController.SetDirectories;
+procedure TDebugController.SetSourceDirs;
   var f,s: string;
       i : longint;
       Dir : SearchRec;
 begin
-  f:=GetSourceDirectories;
+  f:=GetSourceDirectories+';'+OrigPwd;
   repeat
     i:=pos(';',f);
     if i=0 then
@@ -1021,7 +1021,6 @@ end;
 
 function TDebugController.GetPointerAt(addr : CORE_ADDR) : CORE_ADDR;
 var
-  val : CORE_ADDR;
   st : string;
   p : longint;
 begin
@@ -1047,7 +1046,7 @@ var
   PB : PBreakpoint;
   S : String;
   BreakIndex : longint;
-  ebp,stop_addr : CORE_ADDR;
+  stop_addr : CORE_ADDR;
   i,ExitCode : longint;
   ExitAddr,ExitFrame : CORE_ADDR;
 const
@@ -1394,6 +1393,8 @@ begin
   typ:=bt_file_line;
   state:=bs_enabled;
   GDBState:=bs_deleted;
+  AFile:=FEXpand(AFile);
+(*
   { d:test.pas:12 does not work !! }
   { I do not know how to solve this if
   if (Length(AFile)>1) and (AFile[2]=':') then
@@ -1403,10 +1404,10 @@ begin
 {$else}
   CurDir:=LowerCaseStr(GetCurDir);
 {$endif Unix}
-  AFile:=FEXpand(AFile);
   if Pos(CurDir,OSFileName(AFile))=1 then
     FileName:=NewStr(Copy(OSFileName(AFile),length(CurDir)+1,255))
   else
+*)
     FileName:=NewStr(OSFileName(AFile));
   Name:=nil;
   Line:=ALine;
@@ -1634,6 +1635,7 @@ begin
   At:=inherited At(Index);
 end;
 
+
 procedure TBreakpointCollection.Update;
 begin
   if assigned(Debugger) then
@@ -1710,7 +1712,7 @@ procedure TBreakpointCollection.AdaptBreakpoints(Editor : PSourceEditor; Pos, Ch
   procedure AdaptInSource(P : PBreakpoint);{$ifndef FPC}far;{$endif}
   begin
     If assigned(P^.FileName) and
-      (OSFileName(P^.FileName^)=OSFileName(FExpand(Editor^.FileName))) then
+       (P^.FileName^=OSFileName(FExpand(Editor^.FileName))) then
         begin
           if P^.state=bs_enabled then
             Editor^.SetLineFlagState(P^.Line-1,lfBreakpoint,false);
@@ -1748,7 +1750,7 @@ function TBreakpointCollection.FindBreakpointAt(Editor : PSourceEditor; Line : l
   function IsAtLine(P : PBreakpoint) : boolean;{$ifndef FPC}far;{$endif}
   begin
     If assigned(P^.FileName) and
-       (OSFileName(P^.FileName^)=OSFileName(FExpand(Editor^.FileName))) and
+       (P^.FileName^=OSFileName(FExpand(Editor^.FileName))) and
        (Line=P^.Line) then
       IsAtLine:=true
     else
@@ -1788,38 +1790,39 @@ begin
   GetType:=FirstThat(@IsThis);
 end;
 
-function TBreakpointCollection.ToggleFileLine(FileName: String;LineNr : Longint) : boolean;
 
-var PB : PBreakpoint;
+function TBreakpointCollection.ToggleFileLine(FileName: String;LineNr : Longint) : boolean;
 
   function IsThere(P : PBreakpoint) : boolean;{$ifndef FPC}far;{$endif}
   begin
     IsThere:=(P^.typ=bt_file_line) and assigned(P^.FileName) and
       (OSFileName(P^.FileName^)=FileName) and (P^.Line=LineNr);
   end;
+
+var
+  PB : PBreakpoint;
 begin
-    FileName:=OSFileName(FileName);
-    PB:=FirstThat(@IsThere);
     ToggleFileLine:=false;
+    FileName:=OSFileName(FExpand(FileName));
+    PB:=FirstThat(@IsThere);
     If Assigned(PB) then
-      if PB^.state=bs_disabled then
-        begin
-          PB^.state:=bs_enabled;
-          ToggleFileLine:=true;
-        end
-      else if PB^.state=bs_enabled then
+      begin
+        { delete it form source window }
         PB^.state:=bs_disabled;
-    If not assigned(PB) then
+        PB^.UpdateSource;
+	{ remove from collection }
+        BreakpointsCollection^.free(PB);
+      end
+    else
       begin
         PB:= New(PBreakpoint,Init_file_line(FileName,LineNr));
         if assigned(PB) then
           Begin
             Insert(PB);
+            PB^.UpdateSource;
             ToggleFileLine:=true;
           End;
       end;
-    if assigned(PB) then
-      PB^.UpdateSource;
     Update;
 end;
 
@@ -1976,16 +1979,6 @@ begin
   DrawView;
 end;
 
-(* function TBreakpointsListBox.AddModuleName(const Name: string): PString;
-var P: PString;
-begin
-  if ModuleNames<>nil then
-    P:=ModuleNames^.Add(Name)
-  else
-    P:=nil;
-  AddModuleName:=P;
-end;  *)
-
 function TBreakpointsListBox.GetText(Item,MaxLen: Sw_Integer): String;
 var P: PBreakpointItem;
     S: string;
@@ -2001,8 +1994,6 @@ begin
     Dispose(List, Done);
   List:=nil;
   MaxWidth:=0;
-  (* if assigned(ModuleNames) then
-    ModuleNames^.FreeAll; *)
   SetRange(0); DrawView;
   Message(Application,evBroadcast,cmClearLineHighlights,@Self);
 end;
@@ -2011,7 +2002,6 @@ procedure TBreakpointsListBox.TrackSource;
 var W: PSourceWindow;
     P: PBreakpointItem;
     R: TRect;
-    (* Row,Col: sw_integer; *)
 begin
   (*Message(Application,evBroadcast,cmClearLineHighlights,@Self);
   if Range=0 then Exit;*)
@@ -2197,7 +2187,6 @@ destructor TBreakpointsListBox.Done;
 begin
   inherited Done;
   if List<>nil then Dispose(List, Done);
-  (* if ModuleNames<>nil then Dispose(ModuleNames, Done);*)
 end;
 
 {****************************************************************************
@@ -3374,11 +3363,7 @@ GetGDBTargetShortName:='palmos';
 GetGDBTargetShortName:='linux';
 {$endif PALMOSGDB}
 {$else not SUPPORT_REMOTE}
-{$ifdef COMPILER_1_0}
-GetGDBTargetShortName:=source_os.shortname
-{$else}
 GetGDBTargetShortName:=source_info.shortname
-{$endif}
 {$endif not SUPPORT_REMOTE}
 end;
 
@@ -3604,7 +3589,15 @@ end.
 
 {
   $Log$
-  Revision 1.52  2004-11-06 17:22:52  peter
+  Revision 1.53  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.52  2004/11/06 17:22:52  peter
     * fixes for new fv
 
   Revision 1.51  2004/07/09 23:17:25  peter

+ 9 - 18
ide/fpdesk.pas

@@ -45,13 +45,7 @@ implementation
 
 uses Dos,
      Objects,Drivers,
-{$ifndef FVISION}
      Video,
-{$else FVISION}
-{$ifndef GRAPH_API}
-     Video,
-{$endif GRAPH_API}
-{$endif FVISION}
      Views,App,HistList,BrowCol,
      WUtils,WResourc,WViews,WEditor,
 {$ifndef NODEBUG}
@@ -368,15 +362,6 @@ begin
          InitDisassemblyWindow;
          W:=DisassemblyWindow;
        end;
-     hcInfoWindow:
-       begin
-         if ProgramInfoWindow=nil then
-           begin
-             New(ProgramInfoWindow, Init);
-             Desktop^.Insert(ProgramInfoWindow);
-           end;
-         W:=ProgramInfoWindow;
-       end;
      hcWatchesWindow:
        begin
          if WatchesWindow=nil then
@@ -505,7 +490,6 @@ begin
             GetSubViewPtr(S^,ClipboardWindow);
             if Assigned(ClipboardWindow) then Clipboard:=ClipboardWindow^.Editor;
             GetSubViewPtr(S^,CalcWindow);
-            GetSubViewPtr(S^,ProgramInfoWindow);
             GetSubViewPtr(S^,GDBWindow);
             GetSubViewPtr(S^,BreakpointsWindow);
             GetSubViewPtr(S^,WatchesWindow);
@@ -622,7 +606,6 @@ begin
       PutSubViewPtr(S^,CompilerStatusDialog);
       PutSubViewPtr(S^,ClipboardWindow);
       PutSubViewPtr(S^,CalcWindow);
-      PutSubViewPtr(S^,ProgramInfoWindow);
       PutSubViewPtr(S^,GDBWindow);
       PutSubViewPtr(S^,BreakpointsWindow);
       PutSubViewPtr(S^,WatchesWindow);
@@ -963,7 +946,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.9  2004-11-05 16:39:37  peter
+  Revision 1.10  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.9  2004/11/05 16:39:37  peter
     * uninitialized var
 
   Revision 1.8  2004/11/02 23:53:19  peter

+ 9 - 6
ide/fphelp.pas

@@ -19,11 +19,7 @@ interface
 
 uses
   Drivers,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,HelpCtx,
-{$endif}
   WHelp,WHlpView,WHTML,
   WEditor,WCEdit,
   WViews,WHTMLScn,
@@ -163,7 +159,6 @@ begin
     hcTarget        : S:=hint_target;
     hcPrimaryFile   : S:=hint_primaryfile;
     hcClearPrimary  : S:=hint_clearprimaryfile;
-    hcInformation   : S:=hint_information;
     hcCompilerMessages:S:=hint_showmessages;
 
     hcDebugMenu     : S:=hint_debugmenu;
@@ -520,7 +515,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.8  2003-01-22 00:27:58  pierre
+  Revision 1.9  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.8  2003/01/22 00:27:58  pierre
    * implement reloadfile if changed
 
   Revision 1.7  2002/11/28 12:57:42  pierre

+ 17 - 28
ide/fpide.pas

@@ -19,8 +19,8 @@ interface
 {$i globdir.inc}
 
 uses
-  Objects,Drivers,Views,App,Gadgets,MsgBox,
-  {$ifdef EDITORS}Editors,{$else}WEditor,WCEdit,{$endif}
+  Objects,Drivers,Views,App,Gadgets,MsgBox,Tabs,
+  WEditor,WCEdit,
   Comphook,Browcol,
   WHTMLScn,
   FPViews,FPSymbol,fpstring;
@@ -65,6 +65,7 @@ type
       procedure Modules;
       procedure Globals;
       procedure SearchSymbol;
+      procedure RunDir;
       procedure Parameters;
       procedure DoStepOver;
       procedure DoTraceInto;
@@ -88,7 +89,6 @@ type
       procedure DoShowRegisters;
       procedure DoShowFPU;
       function  AskRecompileIfModified:boolean;
-      procedure DoInformation;
       procedure Messages;
       procedure Calculator;
       procedure DoAsciiTable;
@@ -166,15 +166,8 @@ uses
   FpDpAnsi,WConsts,
   Video,Mouse,Keyboard,
   Compiler,Version,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,HelpCtx,
-{$endif}
   Dos,Memory,Menus,Dialogs,StdDlg,
-{$ifndef FVISION}
-  ColorSel,
-{$endif FVISION}
   Systems,
   WUtils,WHlpView,WViews,WHTMLHlp,WHelp,WConsole,
   FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompil,FPHelp,
@@ -256,15 +249,8 @@ end;
 constructor TIDEApp.Init;
 var R: TRect;
 begin
-  {$ifndef EDITORS}
-{$ifdef TP}
-  UseSyntaxHighlight:=IDEUseSyntaxHighlight;
-  UseTabsPattern:=IDEUseTabsPattern;
-{$else TP}
   UseSyntaxHighlight:=@IDEUseSyntaxHighlight;
   UseTabsPattern:=@IDEUseTabsPattern;
-{$endif TP}
-  {$endif}
   inherited Init;
   InitAdvMsgBox;
   InsideDone:=false;
@@ -367,9 +353,10 @@ begin
       NewItem(menu_run_traceinto,menu_key_run_traceinto, kbF7, cmTraceInto, hcRun,
       NewItem(menu_run_conttocursor,menu_key_run_conttocursor, kbF4, cmContToCursor, hcContToCursor,
       NewItem(menu_run_untilreturn,'', kbNoKey,cmUntilReturn,hcUntilReturn,
+      NewItem(menu_run_rundir,'', kbNoKey, cmRunDir, hcRunDir,
       NewItem(menu_run_parameters,'', kbNoKey, cmParameters, hcParameters,
       NewItem(menu_run_resetdebugger,menu_key_run_resetdebugger, kbCtrlF2, cmResetDebugger, hcResetDebugger,
-      nil)))))))),
+      nil))))))))),
     NewSubMenu(menu_compile,hcCompileMenu, NewMenu(
       NewItem(menu_compile_compile,menu_key_compile_compile, kbAltF9, cmCompile, hcCompile,
       NewItem(menu_compile_make,menu_key_compile_make, kbF9, cmMake, hcMake,
@@ -379,9 +366,8 @@ begin
       NewItem(menu_compile_primaryfile,'', kbNoKey, cmPrimaryFile, hcPrimaryFile,
       NewItem(menu_compile_clearprimaryfile,'', kbNoKey, cmClearPrimary, hcClearPrimary,
       NewLine(
-      NewItem(menu_compile_information,'', kbNoKey, cmInformation, hcInformation,
       NewItem(menu_compile_compilermessages,menu_key_compile_compilermessages, kbF12, cmCompilerMessages, hcCompilerMessages,
-      nil))))))))))),
+      nil)))))))))),
     NewSubMenu(menu_debug, hcDebugMenu, NewMenu(
       NewItem(menu_debug_output,'', kbNoKey, cmUserScreenWindow, hcUserScreenWindow,
       NewItem(menu_debug_userscreen,menu_key_debug_userscreen, kbAltF5, cmUserScreen, hcUserScreen,
@@ -574,12 +560,10 @@ begin
   { first of all dispatch queued targeted events }
   while GetTargetedEvent(P,Event) do
     P^.HandleEvent(Event);
-{$ifdef FVISION}
   { Handle System events directly }
   Drivers.GetSystemEvent(Event);         { Load system event }
   If (Event.What <> evNothing) Then
     HandleEvent(Event);
-{$endif FVISION}
 
   inherited GetEvent(Event);
 {$ifdef DEBUG}
@@ -676,6 +660,7 @@ begin
              cmGlobals       : Globals;
              cmSymbol        : SearchSymbol;
            { -- Run menu -- }
+             cmRunDir        : RunDir;
              cmParameters    : Parameters;
              cmStepOver      : DoStepOver;
              cmTraceInto     : DoTraceInto;
@@ -690,7 +675,6 @@ begin
              cmTarget        : Target;
              cmPrimaryFile   : DoPrimaryFile;
              cmClearPrimary  : DoClearPrimary;
-             cmInformation   : DoInformation;
              cmCompilerMessages : DoCompilerMessages;
            { -- Debug menu -- }
              cmUserScreen    : DoUserScreen;
@@ -753,10 +737,8 @@ begin
              cmHelpFiles     : HelpFiles;
              cmAbout         : About;
              cmShowReadme    : ShowReadme;
-{$ifdef FVISION}
              cmResizeApp     : ResizeApplication(Event.Id, Event.InfoWord);
              cmQuitApp       : Message(@Self, evCommand, cmQuit, nil);
-{$endif FVISION}
            else DontClear:=true;
            end;
            if DontClear=false then ClearEvent(Event);
@@ -994,7 +976,7 @@ begin
   SetCmdState([cmSaveAll],IsThereAnyEditor);
   SetCmdState([cmCloseAll,cmWindowList],IsThereAnyWindow);
   SetCmdState([cmTile,cmCascade],IsThereAnyVisibleWindow);
-  SetCmdState([cmFindProcedure,cmObjects,cmModules,cmGlobals,cmSymbol{,cmInformation}],IsSymbolInfoAvailable);
+  SetCmdState([cmFindProcedure,cmObjects,cmModules,cmGlobals,cmSymbol],IsSymbolInfoAvailable);
 {$ifndef NODEBUG}
   SetCmdState([cmResetDebugger,cmUntilReturn],assigned(debugger) and debugger^.debuggee_started);
 {$endif}
@@ -1028,7 +1010,6 @@ begin
   if PrimaryFile<>'' then
      SetCmdState(CompileCmds,true);
   UpdateMenu(MenuBar^.Menu);
-  Message(ProgramInfoWindow,evBroadcast,cmUpdate,nil);
 end;
 
 procedure TIDEApp.UpdateINIFile;
@@ -1248,7 +1229,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.29  2004-11-06 22:02:49  peter
+  Revision 1.30  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.29  2004/11/06 22:02:49  peter
     * fixed resize helptext
 
   Revision 1.28  2004/11/04 20:57:59  peter

+ 14 - 15
ide/fpini.pas

@@ -32,16 +32,12 @@ implementation
 
 uses
   Dos,Objects,Drivers,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   Version,
 {$ifdef USE_EXTERNAL_COMPILER}
    fpintf, { superseeds version_string of version unit }
 {$endif USE_EXTERNAL_COMPILER}
-  WConsts,WUtils,WINI,WViews,{$ifndef EDITORS}WEditor,WCEdit{$else}Editors{$endif},
+  WConsts,WUtils,WINI,WViews,WEditor,WCEdit,
   {$ifndef NODEBUG}FPDebug,{$endif}FPConst,FPVars,
   FPIntf,FPTools,FPSwitch,FPString;
 
@@ -67,6 +63,7 @@ const
   ieRecentFile       = 'RecentFile';
 (*  ieOpenFile         = 'OpenFile';
   ieOpenFileCount    = 'OpenFileCount'; *)
+  ieRunDir           = 'RunDirectory';
   ieRunParameters    = 'Parameters';
   ieDebuggeeRedir    = 'DebugRedirection';
   ieRemoteMachine    = 'RemoteMachine';
@@ -353,11 +350,11 @@ begin
       end;
     end;
   { Run }
+  SetRunDir(INIFile^.GetEntry(secRun,ieRunDir,GetRunDir));
+  SetRunParameters(INIFile^.GetEntry(secRun,ieRunParameters,GetRunParameters));
   { First read the primary file, which can also set the parameters which can
     be overruled with the parameter loading }
   SetPrimaryFile(INIFile^.GetEntry(secCompile,iePrimaryFile,PrimaryFile));
-  SetRunParameters(INIFile^.GetEntry(secRun,ieRunParameters,GetRunParameters));
-{$ifndef GABOR}
   DebuggeeTTY := INIFile^.GetEntry(secRun,ieDebuggeeRedir,DebuggeeTTY);
 {$ifdef SUPPORT_REMOTE}
   RemoteMachine :=INIFile^.GetEntry(secRun,ieRemoteMachine,RemoteMachine);
@@ -367,7 +364,6 @@ begin
   RemoteIdent :=INIFile^.GetEntry(secRun,ieRemoteIdent,RemoteIdent);
   RemoteDir :=INIFile^.GetEntry(secRun,ieRemoteDirectory,RemoteDir);
 {$endif SUPPORT_REMOTE}
-{$endif}
   { Compile }
   S:=INIFile^.GetEntry(secCompile,ieCompileMode,'');
   for ts:=low(TSwitchMode) to high(TSwitchMode) do
@@ -384,12 +380,10 @@ begin
     Delete(S,1,P);
   until S='';
   { Editor }
-{$ifndef EDITORS}
   DefaultTabSize:=INIFile^.GetIntEntry(secEditor,ieDefaultTabSize,DefaultTabSize);
   DefaultIndentSize:=INIFile^.GetIntEntry(secEditor,ieDefaultIndentSize,DefaultIndentSize);
   DefaultCodeEditorFlags:=INIFile^.GetIntEntry(secEditor,ieDefaultEditorFlags,DefaultCodeEditorFlags);
   DefaultSaveExt:=INIFile^.GetEntry(secEditor,ieDefaultSaveExt,DefaultSaveExt);
-{$endif}
   { Highlight }
   HighlightExts:=INIFile^.GetEntry(secHighlight,ieHighlightExts,HighlightExts);
   TabsPattern:=INIFile^.GetEntry(secHighlight,ieTabsPattern,TabsPattern);
@@ -553,8 +547,8 @@ begin
   INIFile^.SetIntEntry(secFiles,ieOpenFileCount,OpenFileCount);
 *)
   { Run }
+  INIFile^.SetEntry(secRun,ieRunDir,GetRunDir);
   INIFile^.SetEntry(secRun,ieRunParameters,GetRunParameters);
-{$ifndef GABOR}
   { If DebuggeeTTY<>'' then }
     INIFile^.SetEntry(secRun,ieDebuggeeRedir,DebuggeeTTY);
 {$ifdef SUPPORT_REMOTE}
@@ -565,7 +559,6 @@ begin
     INIFile^.SetEntry(secRun,ieRemoteIdent,RemoteIdent);
     INIFile^.SetEntry(secRun,ieRemoteDirectory,RemoteDir);
 {$endif SUPPORT_REMOTE}
-{$endif}
   { Compile }
   INIFile^.SetEntry(secCompile,iePrimaryFile,PrimaryFile);
   INIFile^.SetEntry(secCompile,ieCompileMode,SwitchesModeStr[SwitchesMode]);
@@ -574,12 +567,10 @@ begin
   HelpFiles^.ForEach(@ConcatName);
   INIFile^.SetEntry(secHelp,ieHelpFiles,'"'+S+'"');
   { Editor }
-{$ifndef EDITORS}
   INIFile^.SetIntEntry(secEditor,ieDefaultTabSize,DefaultTabSize);
   INIFile^.SetIntEntry(secEditor,ieDefaultIndentSize,DefaultIndentSize);
   INIFile^.SetIntEntry(secEditor,ieDefaultEditorFlags,DefaultCodeEditorFlags);
   INIFile^.SetEntry(secEditor,ieDefaultSaveExt,DefaultSaveExt);
-{$endif}
   { Highlight }
   INIFile^.SetEntry(secHighlight,ieHighlightExts,'"'+HighlightExts+'"');
   INIFile^.SetEntry(secHighlight,ieTabsPattern,'"'+TabsPattern+'"');
@@ -648,7 +639,15 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  2002-12-12 00:03:14  pierre
+  Revision 1.12  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.11  2002/12/12 00:03:14  pierre
    * fix problem with breakpoint conditions that showed up again after exit
 
   Revision 1.10  2002/11/28 12:55:06  pierre

+ 26 - 34
ide/fpintf.pas

@@ -17,17 +17,15 @@
 
 unit FPIntf;
 
-{$ifdef FPC}
-{$ifndef COMPILER_1_0}
 {$mode objfpc}
-{$endif COMPILER_1_0}
-{$endif FPC}
 
 interface
 
 { Run }
 function  GetRunParameters: string;
 procedure SetRunParameters(const Params: string);
+function GetRunDir: string;
+procedure SetRunDir(const Params: string);
 
 { Compile }
 procedure Compile(const FileName, ConfigFile: string);
@@ -42,11 +40,7 @@ implementation
 
 uses
   Compiler,Comphook,
-{$ifdef FPC}
-{$ifndef COMPILER_1_0}
   sysutils,
-{$endif COMPILER_1_0}
-{$endif FPC}
 {$ifndef NODEBUG}
   FPDebug,
 {$endif NODEBUG}
@@ -58,6 +52,7 @@ uses
 ****************************************************************************}
 
 var
+  RunDir,
   RunParameters : string;
 
 function LinkAfter : boolean;
@@ -79,6 +74,20 @@ begin
 {$endif}
 end;
 
+function GetRunDir: string;
+begin
+  GetRunDir:=RunDir;
+end;
+
+procedure SetRunDir(const Params: string);
+begin
+  RunDir:=Params;
+{$ifndef NODEBUG}
+  If assigned(Debugger) then
+    Debugger^.SetDir(RunDir);
+{$endif}
+end;
+
 
 {****************************************************************************
                                    Compile
@@ -200,32 +209,8 @@ begin
   else
 {$endif USE_EXTERNAL_COMPILER}
     begin
-{$ifdef COMPILER_1_0}
-      storeexitproc:=exitproc;
-      if SetJmp(CatchErrorLongJumpBuffer)=0 then
-        begin
-          exitproc:=@CatchCompilationErrors;
-{$else : not COMPILER_1_0}
       try
-{$endif COMPILER_1_0}
           Compiler.Compile(cmd);
-{$ifdef COMPILER_1_0}
-        end
-      else
-        begin
-          ExitReason:=ExitCode;
-          ExitCode:=0;
-          ErrorCode:=0;
-          ExitAddr:=ErrorAddr;
-          ErrorAddr:=nil;
-          CompilationPhase:=cpFailed;
-          { FIXME: this is not 64bit compatible PM }
-          CompilerMessageWindow^.AddMessage(V_Error,
-            'Compiler exited with error '+inttostr(ExitReason)+
-            ' at addr '+inttohex(longint(ExitAddr),8),'',0,0);
-        end;
-      exitproc:=storeexitproc;
-{$else : not COMPILER_1_0}
       except
           on e : exception do
             begin
@@ -236,7 +221,6 @@ begin
                 e.message,'',0,0);
             end;
       end;
-{$endif COMPILER_1_0}
     end;
 end;
 
@@ -291,7 +275,15 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  2002-10-04 15:23:46  pierre
+  Revision 1.6  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.5  2002/10/04 15:23:46  pierre
    * don't use tpexcept anymore
 
   Revision 1.4  2002/09/07 15:40:43  peter

+ 9 - 5
ide/fpkeys.pas

@@ -53,11 +53,7 @@ Procedure SetKnownKeys;
 implementation
 
 uses
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   WUtils;
 
 {$ifndef NotUseTree}
@@ -344,7 +340,15 @@ end.
 
 {
   $Log$
-  Revision 1.4  2004-09-16 16:20:06  peter
+  Revision 1.5  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.4  2004/09/16 16:20:06  peter
     * illegal for-loop var assignemnt
 
   Revision 1.3  2002/09/07 15:40:43  peter

+ 9 - 17
ide/fpmcomp.inc

@@ -105,22 +105,6 @@ begin
 end;
 
 
-procedure TIDEApp.DoInformation;
-begin
-  if ProgramInfoWindow=nil then
-    begin
-      New(ProgramInfoWindow, Init);
-      Desktop^.Insert(ProgramInfoWindow);
-    end;
-  with ProgramInfoWindow^ do
-   begin
-     if not GetState(sfVisible) then
-       Show;
-     MakeFirst;
-   end;
-end;
-
-
 procedure TIDEApp.DoCompilerMessages;
 begin
   if not CompilerMessageWindow^.GetState(sfVisible) then
@@ -130,7 +114,15 @@ end;
 
 {
   $Log$
-  Revision 1.3  2004-11-03 12:05:54  florian
+  Revision 1.4  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.3  2004/11/03 12:05:54  florian
     + supported targets are now read dynamically from the included compiler
 
   Revision 1.2  2002/09/07 15:40:43  peter

+ 12 - 2
ide/fpmfile.inc

@@ -172,7 +172,7 @@ begin
            SourceDirs:=SourceDirs+';'+Dir;
            {$IFNDEF NODEBUG}
            if assigned(Debugger) then
-             Debugger^.SetDirectories;
+             Debugger^.SetSourceDirs;
            {$ENDIF}
          end;
      OpenEditorWindow(nil,FileName,0,0);
@@ -219,11 +219,21 @@ begin
   D^.HelpCtx:=hcChangeDir;
   ExecuteDialog(D,nil);
   CurDirChanged;
+  { Set new startup dir }
+  GetDir(0,StartUpDir);
 end;
 
 {
   $Log$
-  Revision 1.7  2002-10-12 19:43:07  hajny
+  Revision 1.8  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.7  2002/10/12 19:43:07  hajny
     * missing HasSignal conditionals added (needed for FPC/2)
 
   Revision 1.6  2002/09/07 15:40:43  peter

+ 14 - 6
ide/fpmopts.inc

@@ -1235,10 +1235,7 @@ begin
 end;
 
 procedure TIDEApp.Colors;
-{$Ifdef FVISION}
-begin
-end;
-{$else FVISION}
+{$Ifdef COLORSEL}
 var D: PColorDialog;
 begin
   New(D, Init(AppPalette,
@@ -1314,7 +1311,10 @@ begin
       UpdateScreen(true);
     end;
 end;
-{$endif FVISION}
+{$else COLORSEL}
+begin
+end;
+{$endif COLORSEL}
 
 procedure TIDEApp.OpenINI;
 var D: PFileDialog;
@@ -1367,7 +1367,15 @@ end;
 
 {
   $Log$
-  Revision 1.11  2002-12-18 01:21:42  pierre
+  Revision 1.12  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.11  2002/12/18 01:21:42  pierre
    + Use TEditorInputLine instead of TInputLine
 
   Revision 1.10  2002/11/28 12:56:23  pierre

+ 30 - 7
ide/fpmrun.inc

@@ -177,8 +177,8 @@ end;
 procedure TIDEApp.DoRun;
 var
   RunDirect : boolean;
+  oldcurrdir : string;
 begin
-
 {$ifndef NODEBUG}
   if not assigned(Debugger) or not Debugger^.HasExe or not Debugger^.IsRunning then
 {$endif}
@@ -216,11 +216,7 @@ begin
       { we use debugger if and only if there are active breakpoints
         AND the target is correct for debugging !! PM }
       if (ActiveBreakpoints or RestartingDebugger) and
-{$ifdef COMPILER_1_0}
-        (target_os.shortname=source_os.shortname)
-{$else COMPILER_1_0}
-        (target_info.shortname=source_info.shortname)
-{$endif COMPILER_1_0}
+         (target_info.shortname=source_info.shortname)
         then
         begin
           if not assigned(Debugger) or Not Debugger^.HasExe then
@@ -240,12 +236,21 @@ begin
 {$endif ndef NODEBUG}
       if Not RunDirect then
         exit;
+      {$I-}
+       GetDir(0,oldcurrdir);
+       chdir(GetRunDir);
+      {$I+}   
+      EatIO;
 {$ifdef Unix}
       if (DebuggeeTTY<>'') then
         DoExecute(ExeFile,GetRunParameters,DebuggeeTTY,DebuggeeTTY,DebuggeeTTY,exNormal)
       else
 {$endif Unix}
       DoExecute(ExeFile,GetRunParameters,'','','',exNormal);
+      {$I-}
+       chdir(oldcurrdir);
+      {$I+}   
+      EatIO;
       { In case we have something that the compiler touched }
       AskToReloadAllModifiedFiles;
       LastExitCode:=ExecuteResult;
@@ -291,6 +296,16 @@ begin
 end;
 
 
+procedure TIDEApp.RunDir;
+var
+  s : DirStr;
+begin
+  s:=GetRunDir;
+  SelectDir(s,hidRunDir);
+  SetRunDir(s);
+end;
+
+
 procedure TIDEApp.Parameters;
 var R,R2: TRect;
     D: PCenterDialog;
@@ -495,7 +510,15 @@ end;
 
 {
   $Log$
-  Revision 1.8  2002-12-18 01:21:42  pierre
+  Revision 1.9  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.8  2002/12/18 01:21:42  pierre
    + Use TEditorInputLine instead of TInputLine
 
   Revision 1.7  2002/12/16 09:06:08  pierre

+ 9 - 2
ide/fpmwnd.inc

@@ -75,7 +75,6 @@ begin
   P:=List^.At(Item);
   case P^.HelpCtx of
     hcSourceWindow : S:=PSourceWindow(P)^.GetTitle(MaxLen);
-    hcInfoWindow   : S:=PProgramInfoWindow(P)^.GetTitle(MaxLen);
     hcHelpWindow   : S:=PHelpWindow(P)^.GetTitle(MaxLen);
     hcCalcWindow   : S:=PCalculator(P)^.GetTitle(MaxLen);
     hcBrowserWindow: S:=PBrowserWindow(P)^.GetTitle(MaxLen);
@@ -259,7 +258,15 @@ end;
 
 {
   $Log$
-  Revision 1.5  2004-11-06 22:02:49  peter
+  Revision 1.6  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.5  2004/11/06 22:02:49  peter
     * fixed resize helptext
 
   Revision 1.4  2002/09/07 15:40:44  peter

+ 11 - 1
ide/fpstre.inc

@@ -86,6 +86,7 @@ const
       menu_run_traceinto     = '~T~race into';
       menu_run_conttocursor  = '~G~oto Cursor';
       menu_run_untilreturn   = '~U~ntil return';
+      menu_run_rundir        = 'Run ~D~irectory...';
       menu_run_parameters    = 'P~a~rameters...';
       menu_run_resetdebugger = '~P~rogram reset';
 
@@ -950,6 +951,7 @@ const
       hint_symbol            = 'Open a browser a current word (not yet scope sensitive)';
       hint_runmenu           = 'Execution and parameters';
       hint_run               = 'Run the current program';
+      hint_rundir            = 'Set directory that will be used as current working directory at execution';
       hint_runparameters     = 'Set command-line parameters passed to program at execution';
       hint_resetprogram      = 'Reset Program';
       hint_rununtilcursor    = 'Go on until Cursor position';
@@ -1054,7 +1056,15 @@ const
 
 {
   $Log$
-  Revision 1.19  2003-01-22 00:27:58  pierre
+  Revision 1.20  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.19  2003/01/22 00:27:58  pierre
    * implement reloadfile if changed
 
   Revision 1.18  2003/01/14 16:24:02  pierre

+ 29 - 30
ide/fpsymbol.pas

@@ -19,9 +19,9 @@ unit FPSymbol;
 interface
 
 uses Objects,Drivers,Views,Menus,Dialogs,
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
      Outline,
-{$endif FVISION}
+{$endif HASOUTLINE}
      BrowCol,
      WViews,
      FPViews;
@@ -127,7 +127,7 @@ type
       function    GetPalette: PPalette; virtual;
     end;
 
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
     PSymbolInheritanceView = ^TSymbolInheritanceView;
     TSymbolInheritanceView = object(TOutlineViewer)
       constructor  Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
@@ -146,7 +146,7 @@ type
       Root         : PObjectSymbol;
       MyBW         : PBrowserWindow;
     end;
-{$endif FVISION}
+{$endif HASOUTLINE}
 
     PBrowserTabItem = ^TBrowserTabItem;
     TBrowserTabItem = record
@@ -195,9 +195,9 @@ type
       Sym           : PSymbol;
       ScopeView     : PSymbolScopeView;
       ReferenceView : PSymbolReferenceView;
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
       InheritanceView: PSymbolInheritanceView;
-{$endif FVISION}
+{$endif HASOUTLIEN}
       MemInfoView   : PSymbolMemInfoView;
       UnitInfoText  : PSymbolMemoView;
       UnitInfoUsed  : PSymbolScopeView;
@@ -229,11 +229,7 @@ const
 implementation
 
 uses App,Strings,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
 {$ifdef BROWSERCOL}
      symconst,
 {$endif BROWSERCOL}
@@ -249,9 +245,9 @@ procedure CloseAllBrowsers;
        (TypeOf(P^)=TypeOf(TSymbolScopeView)) or
        (TypeOf(P^)=TypeOf(TSymbolReferenceView)) or
        (TypeOf(P^)=TypeOf(TSymbolMemInfoView)) or
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
        (TypeOf(P^)=TypeOf(TSymbolInheritanceView)) or
-{$endif FVISION}
+{$endif HASOUTLINE}
        (TypeOf(P^)=TypeOf(TSymbolMemoView))) then
       Message(P,evCommand,cmClose,nil);
   end;
@@ -1065,7 +1061,7 @@ end;
                           TSymbolInheritanceView
 ****************************************************************************}
 
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
 constructor TSymbolInheritanceView.Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
 begin
   inherited Init(Bounds,AHScrollBar,AVScrollBar);
@@ -1180,7 +1176,7 @@ begin
     S^.GetText,S,nil,
     S^.Items,S^.References,Anc,S^.MemInfo);
 end;
-{$endif FVISION}
+{$endif HASOUTLINE}
 
 
 {****************************************************************************
@@ -1416,12 +1412,12 @@ begin
       Insert(HSB);
       VSB:=CreateVSB(R);
       Insert(VSB);
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
       New(InheritanceView, Init(R, HSB,VSB, AInheritance));
       InheritanceView^.GrowMode:=gfGrowHiX+gfGrowHiY;
       Insert(InheritanceView);
       InheritanceView^.MyBW:=@Self;
-{$endif FVISION}
+{$endif HASOUTLINE}
     end;
   if assigned(AMemInfo) then
     begin
@@ -1512,15 +1508,15 @@ begin
   New(PageTab, Init(R,
     NewBrowserTabItem(label_browsertab_scope,ScopeView,
     NewBrowserTabItem(label_browsertab_reference,ReferenceView,
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
     NewBrowserTabItem(label_browsertab_inheritance,InheritanceView,
-{$endif FVISION}
+{$endif HASOUTLINE}
     NewBrowserTabItem(label_browsertab_memory,MemInfoView,
     NewBrowserTabItem(label_browsertab_unit,UnitInfo,
     nil))
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
     )
-{$endif FVISION}
+{$endif HASOUTLINE}
     ))));
   PageTab^.GrowMode:=gfGrowHiX;
   Insert(PageTab);
@@ -1530,11 +1526,11 @@ begin
   else
    if assigned(ReferenceView) then
     SelectTab(btReferences)
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
   else
    if assigned(InheritanceView) then
     SelectTab(btInheritance)
-{$endif FVISION}
+{$endif HASOUTLINE}
   ;
 end;
 
@@ -1779,10 +1775,10 @@ begin
     Tabs:=Tabs or (1 shl btScope);
   if assigned(ReferenceView) then
     Tabs:=Tabs or (1 shl btReferences);
-{$ifndef FVISION}
+{$ifdef HASOUTLINE}
   if assigned(InheritanceView) then
     Tabs:=Tabs or (1 shl btInheritance);
-{$endif FVISION}
+{$endif HASOUTLINE}
   if assigned(MemInfoView) then
     Tabs:=Tabs or (1 shl btMemInfo);
   if Assigned(Sym) then
@@ -1814,9 +1810,6 @@ begin
   if assigned(ParentBrowser) and assigned(ParentBrowser^.Prefix) and
      assigned(ParentBrowser^.sym) and
      (ParentBrowser^.sym^.typ<>unitsym)
-{$ifdef COMPILER_1_0}
-     and (ParentBrowser^.sym^.typ<>programsym)
-{$endif COMPILER_1_0}
      then
     begin
       st:=GetStr(ParentBrowser^.Prefix)+' '+Name;
@@ -1837,11 +1830,9 @@ begin
   PB:=New(PBrowserWindow, Init(R,
     st2,SearchFreeWindowNo,S,Line,st,
     Symbols,References,Inheritance,MemInfo));
-{$ifndef GABOR}
   if (assigned(S) and (S^.typ=varsym)) or
      (assigned(ParentBrowser) and ParentBrowser^.IsValid) then
     PB^.IsValid:=true;
-{$endif}
 
   Desktop^.Insert(PB);
 end;
@@ -1849,7 +1840,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.6  2002-12-02 01:00:12  pierre
+  Revision 1.7  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.6  2002/12/02 01:00:12  pierre
    + Alt+I to disassemble a function from browser window
 
   Revision 1.5  2002/09/07 15:40:45  peter

+ 9 - 5
ide/fptemplt.pas

@@ -36,11 +36,7 @@ implementation
 
 uses
   Dos,Objects,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   MsgBox,
   WUtils,
   WEditor,
@@ -291,7 +287,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.4  2002-09-26 20:45:08  pierre
+  Revision 1.5  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.4  2002/09/26 20:45:08  pierre
    * fix webbug 2102-C
 
   Revision 1.3  2002/09/07 15:40:45  peter

+ 11 - 7
ide/fptools.pas

@@ -140,8 +140,8 @@ procedure InitToolTempFiles;
 procedure DoneToolTempFiles;
 
 const
-     ToolFilter     : string[{$ifndef GABOR}128{$else}40{$endif}]      = '';
-     ToolOutput     : string[{$ifndef GABOR}128{$else}40{$endif}]      = '';
+     ToolFilter     : string[128]      = '';
+     ToolOutput     : string[128]      = '';
      CaptureToolTo  : TCaptureTarget   = capNone;
      ToolMessages   : PCollection      = nil;
      ToolModuleNames: PStoreCollection = nil;
@@ -154,11 +154,7 @@ procedure RegisterFPTools;
 implementation
 
 uses Dos,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      App,MsgBox,
      WConsts,WUtils,WINI,
      FPConst,FPString,FPVars,FPUtils;
@@ -1621,7 +1617,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.5  2002-12-18 01:21:16  pierre
+  Revision 1.6  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.5  2002/12/18 01:21:16  pierre
    + Use TEditorInputLine instead of TInputLine
 
   Revision 1.4  2002/09/07 15:40:46  peter

+ 9 - 3
ide/fpusrscr.pas

@@ -1300,11 +1300,9 @@ begin
   GetConsoleScreenBufferInfo(IDEScreenBufferHandle,
     @ConsoleScreenBufferInfo);
   SetConsoleActiveScreenBuffer(IDEScreenBufferHandle);
-{$ifdef fvision}
   { Needed to force InitSystemMsg to use the right console handle }
   DoneEvents;
   InitEvents;
-{$endif fvision}
   IdeMode:=(IdeMode or ENABLE_MOUSE_INPUT or ENABLE_WINDOW_INPUT) and not ENABLE_PROCESSED_INPUT;
   SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), IdeMode);
   WindowPos.left:=0;
@@ -1514,7 +1512,15 @@ end;
 end.
 {
   $Log$
-  Revision 1.36  2004-11-04 11:46:54  peter
+  Revision 1.37  2004-11-08 20:28:26  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.36  2004/11/04 11:46:54  peter
   fixed compilation for new fvision
 
   Revision 1.35  2004/09/19 14:51:03  armin

+ 30 - 23
ide/fpvars.pas

@@ -27,7 +27,7 @@ uses Objects,Views,App,
 
 type
     TRecentFileEntry = record
-      FileName  : string{$ifdef GABOR}[60]{$endif};
+      FileName  : string;
       LastPos   : TPoint;
     end;
 
@@ -38,28 +38,27 @@ const ClipboardWindow  : PClipboardWindow = nil;
       CalcWindow       : PCalculator = nil;
       RecentFileCount  : integer = 0;
       LastCompileTime  : cardinal = 0;
-      OpenExts         : string{$ifdef GABOR}[40]{$endif} = '*.pas;*.pp;*.inc';
-      HighlightExts    : string{$ifdef GABOR}[40]{$endif} = '*.pas;*.pp;*.inc';
-      TabsPattern      : string{$ifdef GABOR}[40]{$endif} = 'make*;make*.*;fpcmake.loc';
-      SourceDirs       : string{$ifdef GABOR}[40]{$endif} = '';
-      StandardUnits    : string{$ifdef GABOR}[40]{$endif} = '';
+      OpenExts         : string = '*.pas;*.pp;*.inc';
+      HighlightExts    : string = '*.pas;*.pp;*.inc';
+      TabsPattern      : string = 'make*;make*.*;fpcmake.loc';
+      SourceDirs       : string = '';
+      StandardUnits    : string = '';
       UseStandardUnitsInCodeComplete : boolean = false;
       UseAllUnitsInCodeComplete : boolean = true;
       ShowOnlyUnique   : boolean = true;
-      PrimaryFile      : string{$ifdef GABOR}[60]{$endif} = '';
-      PrimaryFileMain  : string{$ifdef GABOR}[60]{$endif} = '';
-      PrimaryFileSwitches : string{$ifdef GABOR}[80]{$endif} = '';
-      PrimaryFilePara  : string{$ifdef GABOR}[80]{$endif} = '';
-      GDBOutputFile    : string{$ifdef GABOR}[50]{$endif} = GDBOutputFileName;
+      PrimaryFile      : string = '';
+      PrimaryFileMain  : string = '';
+      PrimaryFileSwitches : string = '';
+      PrimaryFilePara  : string = '';
+      GDBOutputFile    : string = GDBOutputFileName;
       IsEXECompiled    : boolean = false;
       { LinkAfter        : boolean = true; changed into a function }
       MainHasDebugInfo : boolean = false;
       UseMouse         : boolean = true;
-      MainFile         : string{$ifdef GABOR}[60]{$endif} = '';
-      PrevMainFile     : string{$ifdef GABOR}[60]{$endif} = '';
-      EXEFile          : string{$ifdef GABOR}[60]{$endif} = '';
+      MainFile         : string = '';
+      PrevMainFile     : string = '';
+      EXEFile          : string = '';
       CompilationPhase : TCompPhase = cpNothing;
-      ProgramInfoWindow: PProgramInfoWindow = nil;
       GDBWindow        : PGDBWindow = nil;
       DisassemblyWindow : PDisassemblyWindow = nil;
       BreakpointsWindow : PBreakpointsWindow = nil;
@@ -73,20 +72,20 @@ const ClipboardWindow  : PClipboardWindow = nil;
       ClockView        : PFPClockView = nil;
       HelpFiles        : WUtils.PUnsortedStringCollection = nil;
       ShowStatusOnError: boolean = true;
-      StartupDir       : string{$ifdef GABOR}[60]{$endif} = '.'+DirSep;
-      IDEDir           : string{$ifdef GABOR}[60]{$endif} = '.'+DirSep;
+      StartupDir       : string = '.'+DirSep;
+      IDEDir           : string = '.'+DirSep;
 {$ifdef Unix}
-      SystemIDEDir     : string{$ifdef GABOR}[60]{$endif} = '';
+      SystemIDEDir     : string = '';
 {$endif Unix}
-      INIFileName      : string{$ifdef GABOR}[50]{$endif} = ININame;
-      SwitchesPath     : string{$ifdef GABOR}[60]{$endif} = SwitchesName;
+      INIFileName      : string = ININame;
+      SwitchesPath     : string = SwitchesName;
       CtrlMouseAction  : integer = acTopicSearch;
       AltMouseAction   : integer = acBrowseSymbol;
       StartupOptions   : longint = 0;
       LastExitCode     : integer = 0;
       ASCIIChart       : PFPASCIIChart = nil;
-      BackgroundPath   : string{$ifdef GABOR}[60]{$endif} = BackgroundName;
-      DesktopPath      : string{$ifdef GABOR}[60]{$endif} = DesktopName;
+      BackgroundPath   : string = BackgroundName;
+      DesktopPath      : string = DesktopName;
       DesktopFileFlags : longint = dfHistoryLists+dfOpenWindows+
                                    dfCodeCompleteWords+dfCodeTemplates;
       DesktopLocation  : byte    = dlConfigFileDir;
@@ -126,7 +125,15 @@ implementation
 END.
 {
   $Log$
-  Revision 1.8  2002-12-12 00:06:41  pierre
+  Revision 1.9  2004-11-08 20:28:28  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.8  2002/12/12 00:06:41  pierre
    Use fpregs unit
 
   Revision 1.7  2002/11/28 12:53:10  pierre

+ 17 - 153
ide/fpviews.pas

@@ -21,12 +21,8 @@ interface
 
 uses
   Dos,Objects,Drivers,
-{$ifdef FVISION}
   FVConsts,
-{$else FVISION}
-  Commands,HelpCtx,
-{$endif FVISION}
-  Views,Menus,Dialogs,App,Gadgets,
+  Views,Menus,Dialogs,App,Gadgets,Tabs,
   ASCIITAB,
   WEditor,WCEdit,
   WUtils,WHelp,WHlpView,WViews,WANSI,
@@ -320,22 +316,7 @@ type
       procedure   HandleEvent(var Event: TEvent); virtual;
     end;
 
-    PProgramInfoWindow = ^TProgramInfoWindow;
-    TProgramInfoWindow = object(TFPDlgWindow)
-      InfoST: PColorStaticText;
-      LogLB : PMessageListBox;
-      constructor Init;
-      constructor Load(var S: TStream);
-      procedure   Store(var S: TStream);
-      procedure   AddMessage(AClass: longint; Msg, Module: string; Line, Column: longint);
-      procedure   ClearMessages;
-      procedure   SizeLimits(var Min, Max: TPoint); virtual;
-      procedure   Close; virtual;
-      procedure   HandleEvent(var Event: TEvent); virtual;
-      procedure   Update; virtual;
-      destructor  Done; virtual;
-    end;
-
+(*
     PTabItem = ^TTabItem;
     TTabItem = record
       Next : PTabItem;
@@ -372,6 +353,7 @@ type
     private
       InDraw: boolean;
     end;
+*)
 
     PScreenView = ^TScreenView;
     TScreenView = object(TScroller)
@@ -499,7 +481,7 @@ const
 
       CalcClipboard   : extended = 0;
 
-      OpenFileName    : string{$ifdef GABOR}[50]{$endif} = '';
+      OpenFileName    : string = '';
       OpenFileLastExt : string[12] = '*.pas';
       NewEditorOpened : boolean = false;
 
@@ -518,15 +500,9 @@ uses
   Video,Strings,Keyboard,Validate,
   globtype,Tokens,Version,
   cpubase,
-{$ifdef COMPILER_1_0}
-  {$ifdef I386}
-     ra386,
-  {$endif I386}
-{$else}
   {$if defined(I386) or defined(x64_86)}
      rax86,
   {$endif}
-{$endif}
 {$ifdef USE_EXTERNAL_COMPILER}
    fpintf, { superseeds version_string of version unit }
 {$endif USE_EXTERNAL_COMPILER}
@@ -599,12 +575,6 @@ const
      Load:    @TFPASCIIChart.Load;
      Store:   @TFPASCIIChart.Store
   );
-  RProgramInfoWindow: TStreamRec = (
-     ObjType: 1510;
-     VmtLink: Ofs(TypeOf(TProgramInfoWindow)^);
-     Load:    @TProgramInfoWindow.Load;
-     Store:   @TProgramInfoWindow.Store
-  );
   RFPDlgWindow: TStreamRec = (
      ObjType: 1511;
      VmtLink: Ofs(TypeOf(TFPDlgWindow)^);
@@ -903,11 +873,7 @@ var
 begin
 {$ifdef I386}
   if index <= ord(lastop) - ord(firstop) then
-{$ifdef COMPILER_1_0}
-    GetAsmReservedWord:=att_op2str[tasmop(Index+ord(firstop))]
-{$else}
     GetAsmReservedWord:=std_op2str[tasmop(Index+ord(firstop))]
-{$endif}
   else
     begin
       index:=index - (ord(lastop) - ord(firstop) );
@@ -2107,12 +2073,7 @@ procedure TSourceWindow.SetTitle(ATitle: string);
 begin
   if Title<>nil then DisposeStr(Title);
   Title:=NewStr(ATitle);
-{$ifdef OLDGVFVISION}
-  If assigned(Owner) then
-    DrawBorder;
-{$else}
   Frame^.DrawView;
-{$endif}
 end;
 
 procedure TSourceWindow.HandleEvent(var Event: TEvent);
@@ -3203,111 +3164,7 @@ begin
 end;
 
 
-constructor TProgramInfoWindow.Init;
-var R,R2: TRect;
-    HSB,VSB: PScrollBar;
-    ST: PStaticText;
-    C: word;
-const White = 15;
-begin
-  Desktop^.GetExtent(R); R.A.Y:=R.B.Y-13;
-  inherited Init(R, dialog_programinformation, wnNoNumber);
-
-  HelpCtx:=hcInfoWindow;
-
-  GetExtent(R); R.Grow(-1,-1); R.B.Y:=R.A.Y+3;
-  C:=((Desktop^.GetColor(32+6) and $f0) or White)*256+Desktop^.GetColor(32+6);
-  New(InfoST, Init(R,'', C, false)); InfoST^.GrowMode:=gfGrowHiX;
-  Insert(InfoST);
-  GetExtent(R); R.Grow(-1,-1); Inc(R.A.Y,3); R.B.Y:=R.A.Y+1;
-  New(ST, Init(R, CharStr('Ä', MaxViewWidth))); ST^.GrowMode:=gfGrowHiX; Insert(ST);
-  GetExtent(R); R.Grow(-1,-1); Inc(R.A.Y,4);
-  R2.Copy(R); Inc(R2.B.Y); R2.A.Y:=R2.B.Y-1;
-  New(HSB, Init(R2)); HSB^.GrowMode:=gfGrowLoY+gfGrowHiY+gfGrowHiX; Insert(HSB);
-  R2.Copy(R); Inc(R2.B.X); R2.A.X:=R2.B.X-1;
-  New(VSB, Init(R2)); VSB^.GrowMode:=gfGrowLoX+gfGrowHiX+gfGrowHiY; Insert(VSB);
-  New(LogLB, Init(R,HSB,VSB));
-  LogLB^.GrowMode:=gfGrowHiX+gfGrowHiY;
-  LogLB^.Transparent:=true;
-  Insert(LogLB);
-  Update;
-end;
-
-constructor TProgramInfoWindow.Load(var S : TStream);
-begin
-  inherited Load(S);
-  GetSubViewPtr(S,InfoST);
-  GetSubViewPtr(S,LogLB);
-end;
-
-procedure TProgramInfoWindow.Store(var S : TStream);
-begin
-  inherited Store(S);
-  PutSubViewPtr(S,InfoST);
-  PutSubViewPtr(S,LogLB);
-end;
-
-procedure TProgramInfoWindow.AddMessage(AClass: longint; Msg, Module: string; Line, Column: longint);
-begin
-  if AClass>=V_Info then Line:=0;
-  LogLB^.AddItem(New(PCompilerMessage, Init(AClass, Msg, LogLB^.AddModuleName(Module), Line, Column)));
-end;
-
-procedure TProgramInfoWindow.ClearMessages;
-begin
-  LogLB^.Clear;
-  ReDraw;
-end;
-
-procedure TProgramInfoWindow.SizeLimits(var Min, Max: TPoint);
-begin
-  inherited SizeLimits(Min,Max);
-  Min.X:=30; Min.Y:=9;
-end;
-
-procedure TProgramInfoWindow.Close;
-begin
-  Hide;
-end;
-
-procedure TProgramInfoWindow.HandleEvent(var Event: TEvent);
-begin
-  case Event.What of
-    evBroadcast :
-      case Event.Command of
-        cmUpdate :
-          Update;
-      end;
-  end;
-  inherited HandleEvent(Event);
-end;
-
-procedure TProgramInfoWindow.Update;
-begin
-  ClearFormatParams;
-  AddFormatParamStr(label_proginfo_currentmodule);
-  AddFormatParamStr(MainFile);
-  AddFormatParamStr(label_proginfo_lastexitcode);
-  AddFormatParamInt(LastExitCode);
-  AddFormatParamStr(label_proginfo_availablememory);
-  AddFormatParamInt(MemAvail div 1024);
-  InfoST^.SetText(
-   FormatStrF(
-    {#13+ }
-    '%24s : %s'#13+
-    '%24s : %d'#13+
-    '%24s : %5d'+'K'+#13+
-    '',
-   FormatParams)
-  );
-end;
-
-destructor TProgramInfoWindow.Done;
-begin
-  inherited Done;
-  ProgramInfoWindow:=nil;
-end;
-
+(*
 constructor TTab.Init(var Bounds: TRect; ATabDef: PTabDef);
 begin
   inherited Init(Bounds);
@@ -3694,6 +3551,8 @@ begin
           P:=X;
         end;
 end;
+*)
+
 
 constructor TScreenView.Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar;
               AScreen: PScreen);
@@ -4170,9 +4029,7 @@ begin
   R2.Copy(R); R2.B.Y:=R2.A.Y+1;
   Insert(New(PStaticText, Init(R2, ^C'FreePascal IDE for '+OSStr)));
   R2.Move(0,1);
-  Insert(New(PStaticText, Init(R2, ^C'Version '+VersionStr+' '+{$i %date%}
-    {$ifdef FVISION}+' FV'{$endif}
-    )));
+  Insert(New(PStaticText, Init(R2, ^C'Version '+VersionStr+' '+{$i %date%})));
   R2.Move(0,1);
 {$ifdef USE_GRAPH_SWITCH}
   Insert(New(PStaticText, Init(R2, ^C'With Graphic Support')));
@@ -4573,7 +4430,6 @@ begin
   RegisterType(RGDBSourceEditor);
   RegisterType(RGDBWindow);
   RegisterType(RFPASCIIChart);
-  RegisterType(RProgramInfoWindow);
   RegisterType(RFPDlgWindow);
 end;
 
@@ -4581,7 +4437,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.46  2004-11-06 17:22:52  peter
+  Revision 1.47  2004-11-08 20:28:29  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.46  2004/11/06 17:22:52  peter
     * fixes for new fv
 
   Revision 1.45  2004/11/05 00:21:56  peter

+ 1 - 14
ide/globdir.inc

@@ -36,9 +36,6 @@
   {$ifdef DEBUG}
     {$define USE_GRAPH_SWITCH}
   {$endif DEBUG}
-  {$ifdef COMPILER_1_0}
-    {$define USE_GRAPH_SWITCH}
-  {$endif COMPILER_1_0}
 {$endif}
 
 {$ifdef Linux}
@@ -134,7 +131,7 @@
 {$ifdef FPC}
   {$define USERESSTRINGS}
   {$define USE_FREEVISION}
-  
+
   { Use inlining for small functions }
   {$ifndef VER1_0}
     {$inline on}
@@ -152,16 +149,6 @@
   {$define VESA}
 {$endif}
 
-{$ifdef GABOR}
-  {.$define NOOBJREG}
-  {$define NODEBUG}
-  {$define DEBUG}
-  {$undef EXEDEBUG}
-  {$undef USERESSTRINGS}
-  {.$define LANG_HUN}
-  {$undef WinClipSupported}
-{$endif}
-
 {$ifdef NOWINCLIP}
   {$undef WINCLIPSUPPORTED}
 {$endif}

+ 9 - 5
ide/wcedit.pas

@@ -262,11 +262,7 @@ implementation
 
 uses Dos,
      WConsts,
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      App,WViews;
 
 {$ifndef NOOBJREG}
@@ -2071,7 +2067,15 @@ end;
 END.
 {
  $Log$
- Revision 1.19  2004-05-03 21:12:54  peter
+ Revision 1.20  2004-11-08 20:28:29  peter
+   * Breakpoints are now deleted when removed from source, disabling is
+     still possible from the breakpoint list
+   * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+     FV and 1.9.x compilers
+   * Run directory added to Run menu
+   * Useless programinfo window removed
+
+ Revision 1.19  2004/05/03 21:12:54  peter
    * 64bit fixes
 
  Revision 1.18  2003/06/19 15:20:29  pierre

+ 16 - 88
ide/weditor.pas

@@ -20,11 +20,7 @@ interface
 {tes}
 uses
   Dos,Objects,Drivers,Views,Dialogs,Menus,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   WUtils;
 
 const
@@ -476,11 +472,9 @@ type
     public
       procedure   Draw; virtual;
       procedure   DrawCursor; virtual;
-{$ifdef USE_FREEVISION}
       { this is the only way I found to avoid
         having the cursor being updated if lock is on PM }
       procedure   ResetCursor; virtual;
-{$endif USE_FREEVISION}
       procedure   DrawIndicator; virtual;
     public
    {a}function    GetFlags: longint; virtual;
@@ -775,11 +769,8 @@ uses
   WConsts,WViews,WCEdit;
 
 type
-{$ifdef FVISION}
     RecordWord = sw_word;
-{$else  not FVISION}
-    RecordWord = word;
-{$endif not FVISION}
+
      TFindDialogRec = packed record
        Find     : String[FindStrSize];
        Options  : RecordWord{longint};
@@ -2601,9 +2592,7 @@ end;
 procedure TCustomCodeEditor.Lock;
 begin
   Inc(ELockFlag);
-{$ifdef FVISION}
   LockScreenUpdate;
-{$endif FVISION}
 end;
 
 procedure TCustomCodeEditor.UnLock;
@@ -2613,10 +2602,8 @@ begin
     Bug('negative lockflag',nil)
   else
 {$endif DEBUG}
-{$ifdef FVISION}
   UnlockScreenUpdate;
-{$endif FVISION}
-    Dec(ELockFlag);
+  Dec(ELockFlag);
   if (ELockFlag>0) then
     Exit;
 
@@ -3759,7 +3746,7 @@ begin
     Color:=(Color and $F0) or $F;
   CombineColors:=Color;
 end;
-var 
+var
     FoldPrefix,FoldSuffix: string;
 {    SkipLine: boolean;}
 {    FoldStartLine: sw_integer;}
@@ -3933,83 +3920,16 @@ begin
     end;
 end;
 
-{$ifdef USE_FREEVISION}
 procedure TCustomCodeEditor.ResetCursor;
-const
-  sfV_CV_F:word = sfVisible + sfCursorVis + sfFocused;
-var
-  p,p2 : PView;
-{$ifndef FVISION}
-  G : PGroup;
-{$endif FVISION}
-  cur : TPoint;
-
-  function Check0:boolean;
-  var
-    res : byte;
-  begin
-    res:=0;
-    while res=0 do
-     begin
-       p:=p^.next;
-       if p=p2 then
-        begin
-          p:=P^.owner;
-          res:=1
-        end
-       else
-        if ((p^.state and sfVisible)<>0) and
-           (cur.x>=p^.origin.x) and
-           (cur.x<p^.size.x+p^.origin.x) and
-           (cur.y>=p^.origin.y) and
-           (cur.y<p^.size.y+p^.origin.y) then
-          res:=2;
-     end;
-    Check0:=res=2;
-  end;
-
 begin
   if Elockflag>0 then
     begin
       DrawCursorCalled:=true;
       exit;
     end
-{$ifdef FVISION}
-  else inherited ResetCursor;
-{$else not FVISION}
-  else if (state and sfV_CV_F) = sfV_CV_F then
-   begin
-     p:=@Self;
-     cur:=cursor;
-     while true do
-      begin
-        if (cur.x<0) or (cur.x>=p^.size.x) or
-           (cur.y<0) or (cur.y>=p^.size.y) then
-          break;
-        p2:=p;
-        cur.x:=cur.x+p^.origin.x;
-        cur.y:=cur.y+p^.origin.y;
-        G:=p^.owner;
-        if G=Nil then { top view }
-         begin
-           Video.SetCursorPos(cur.x,cur.y);
-           if (state and sfCursorIns)<>0 then
-            Video.SetCursorType(crBlock)
-           else
-            Video.SetCursorType(crUnderline);
-           exit;
-         end;
-        if (G^.state and sfVisible)=0 then
-         break;
-        p:=G^.Last;
-        if Check0 then
-         break;
-      end; { while }
-   end; { if }
-  Video.SetCursorType(crHidden);
-{$endif not FVISION}
-end;
-{$endif USE_FREEVISION}
+  else
+    inherited ResetCursor;
+end;
 
 function TCustomCodeEditor.Overwrite: boolean;
 begin
@@ -5592,7 +5512,7 @@ begin
 
   Lock;
 
-  CP.X:=-1; CP.Y:=-1; 
+  CP.X:=-1; CP.Y:=-1;
   Line:=GetDisplayText(CurPos.Y);
   X:=CurPos.X; ShortCut:='';
   if X<=length(Line) then
@@ -7271,7 +7191,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.47  2004-11-06 17:22:53  peter
+  Revision 1.48  2004-11-08 20:28:29  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.47  2004/11/06 17:22:53  peter
     * fixes for new fv
 
   Revision 1.46  2004/11/03 12:08:30  peter

+ 11 - 16
ide/whlpview.pas

@@ -19,18 +19,13 @@ interface
 
 uses
   Objects,Drivers,Views,
-{$ifdef FVISION}
   FVConsts,
-{$else}
-  Commands,
-{$endif}
   WEditor,WCEdit,
   WUtils,WHelp;
 
-{$IFNDEF EDITORS}
 type
-    TEditor = TCodeEditor; PEditor = PCodeEditor;
-{$ENDIF}
+    TEditor = TCodeEditor;
+    PEditor = PCodeEditor;
 
 const
      cmPrevTopic         = 90;
@@ -783,9 +778,7 @@ procedure THelpViewer.RenderTopic;
 begin
   if HelpTopic<>nil then
     HelpTopic^.SetParams(Margin,Size.X);
-{$ifndef EDITORS}
   SetLimit(255,GetLineCount);
-{$endif}
   DrawView;
 end;
 
@@ -1206,9 +1199,7 @@ var NormalColor, LinkColor,
     LastLinkDrawn,LastColorAreaDrawn: sw_integer;
     S: string;
     R: TRect;
-{$ifndef EDITORS}
     SelR : TRect;
-{$endif}
     C,Mask: word;
     CurP: TPoint;
     ANDSB,ORSB: word;
@@ -1223,9 +1214,7 @@ begin
 
   NormalColor:=GetColor(1); LinkColor:=GetColor(2);
   SelectColor:=GetColor(3); SelectionColor:=GetColor(4);
-{$ifndef EDITORS}
   SelR.A:=SelStart; SelR.B:=SelEnd;
-{$endif}
   LastLinkDrawn:=0; LastColorAreaDrawn:=0;
   for DY:=0 to Size.Y-1 do
   begin
@@ -1287,7 +1276,6 @@ begin
           end;
       end;
 
-{$ifndef EDITORS}
       if ((SelR.A.X<>SelR.B.X) or (SelR.A.Y<>SelR.B.Y)) and (SelR.A.Y<=Y) and (Y<=SelR.B.Y) then
       begin
         if Y=SelR.A.Y then MinX:=SelR.A.X else MinX:=0;
@@ -1300,7 +1288,6 @@ begin
             B[ScreenX]:=(B[ScreenX] and $0fff) or ((SelectionColor and $f0) shl 8);
         end;
       end;
-{$endif}
 
     end;
     WriteLine(0,DY,Size.X,1,B);
@@ -1419,7 +1406,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.10  2003-01-18 01:36:23  pierre
+  Revision 1.11  2004-11-08 20:28:29  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.10  2003/01/18 01:36:23  pierre
    * fix web bug 1649
 
   Revision 1.9  2002/09/07 15:40:49  peter

+ 10 - 6
ide/wviews.pas

@@ -262,11 +262,7 @@ uses Mouse,
      WinClip,
      FpConst,
 {$endif WinClipSupported}
-{$ifdef FVISION}
      FVConsts,
-{$else}
-     Commands,
-{$endif}
      App,MsgBox,StdDlg,
      WConsts,WUtils;
 
@@ -1657,7 +1653,7 @@ begin
 	  begin
             p^.disabled:=false;
             IsEnabled:=true;
-	  end;  
+	  end;
        end;
     P:=P^.Next;
   end;
@@ -2538,7 +2534,15 @@ end;
 END.
 {
   $Log$
-  Revision 1.9  2004-11-06 17:22:53  peter
+  Revision 1.10  2004-11-08 20:28:29  peter
+    * Breakpoints are now deleted when removed from source, disabling is
+      still possible from the breakpoint list
+    * COMPILER_1_0, FVISION, GABOR defines removed, only support new
+      FV and 1.9.x compilers
+    * Run directory added to Run menu
+    * Useless programinfo window removed
+
+  Revision 1.9  2004/11/06 17:22:53  peter
     * fixes for new fv
 
   Revision 1.8  2004/02/13 06:26:46  pierre