Asciitab now in fvision

ide/fpide.pas

@@ -29,6 +29,7 @@ type
     TExecType = (exNormal,exNoSwap,exDosShell);
 
     TIDEApp = object(TApplication)
+      IsRunning : boolean;
       constructor Init;
       procedure   InitDesktop; virtual;
       procedure   InitMenuBar; virtual;
@@ -257,6 +258,7 @@ begin
   inherited Init;
   InitAdvMsgBox;
   InsideDone:=false;
+  IsRunning:=true;
   MenuBar^.GetBounds(R); R.A.X:=R.B.X-8;
   New(ClockView, Init(R));
   ClockView^.GrowMode:=gfGrowLoX+gfGrowHiX;
@@ -391,14 +393,8 @@ begin
       NewLine(
       NewItem(menu_tools_grep,menu_key_tools_grep, kbShiftF2, cmGrep, hcGrep,
       NewItem(menu_tools_calculator, '', kbNoKey, cmCalculator, hcCalculator,
-{$ifndef FVISION}
       NewItem(menu_tools_asciitable, '', kbNoKey, cmAsciiTable, hcAsciiTable,
-{$endif}
-      nil))))))
-{$ifndef FVISION}
-      )
-{$endif}
-      ),
+      nil)))))))),
     NewSubMenu(menu_options, hcOptionsMenu, NewMenu(
       NewItem(menu_options_mode,'', kbNoKey, cmSwitchesMode, hcSwitchesMode,
       NewItem(menu_options_compiler,'', kbNoKey, cmCompiler, hcCompiler,
@@ -1185,6 +1181,7 @@ end;
 destructor TIDEApp.Done;
 begin
   InsideDone:=true;
+  IsRunning:=false;
   inherited Done;
   RemoveBrowsersCollection;
   DoneHelpSystem;
@@ -1193,7 +1190,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.11  2002-04-25 13:34:17  pierre
+  Revision 1.12  2002-05-29 22:38:13  pierre
+   Asciitab now in fvision
+
+  Revision 1.11  2002/04/25 13:34:17  pierre
    * fix the disappearing desktop for win32
 
   Revision 1.10  2002/04/12 08:58:22  pierre

ide/fpmtools.inc

@@ -24,7 +24,6 @@ end;
 
 procedure TIDEApp.DoAsciiTable;
 begin
-{$ifndef FVISION}
   if ASCIIChart=nil then
     begin
       New(ASCIIChart, Init);
@@ -32,7 +31,6 @@ begin
     end
   else
     ASCIIChart^.Focus;
-{$endif FVISION}
 end;
 
 
@@ -354,7 +352,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2001-08-05 12:23:00  peter
+  Revision 1.3  2002-05-29 22:38:13  pierre
+   Asciitab now in fvision
+
+  Revision 1.2  2001/08/05 12:23:00  peter
     * Automatically support for fvision or old fv
 
   Revision 1.1  2001/08/04 11:30:23  peter

ide/fpvars.pas

@@ -80,9 +80,7 @@ const ClipboardWindow  : PClipboardWindow = nil;
       AltMouseAction   : integer = acBrowseSymbol;
       StartupOptions   : longint = 0;
       LastExitCode     : integer = 0;
-{$ifndef FVISION}
       ASCIIChart       : PFPASCIIChart = nil;
-{$endif FVISION}
       BackgroundPath   : string{$ifdef GABOR}[60]{$endif} = BackgroundName;
       DesktopPath      : string{$ifdef GABOR}[60]{$endif} = DesktopName;
       DesktopFileFlags : longint = dfHistoryLists+dfOpenWindows+
@@ -114,7 +112,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.2  2001-08-05 12:23:01  peter
+  Revision 1.3  2002-05-29 22:33:23  pierre
+   Asciitab now in fvision
+
+  Revision 1.2  2001/08/05 12:23:01  peter
     * Automatically support for fvision or old fv
 
   Revision 1.1  2001/08/04 11:30:24  peter

ide/fpviews.pas

@@ -27,9 +27,7 @@ uses
   Commands,HelpCtx,
 {$endif FVISION}
   Views,Menus,Dialogs,App,Gadgets,
-{$ifndef FVISION}
   ASCIITAB,
-{$endif FVISION}
   WEditor,WCEdit,
   WUtils,WHelp,WHlpView,WViews,WANSI,
   Comphook,
@@ -392,7 +390,6 @@ type
       TitleST : PStaticText;
     end;
 
-{$ifndef FVISION}
     PFPASCIIChart = ^TFPASCIIChart;
     TFPASCIIChart = object(TASCIIChart)
       constructor Init;
@@ -401,7 +398,6 @@ type
       procedure   HandleEvent(var Event: TEvent); virtual;
       destructor  Done; virtual;
     end;
-{$endif FVISION}
 
     PVideoModeListBox = ^TVideoModeListBox;
     TVideoModeListBox = object(TDropDownListBox)
@@ -478,6 +474,7 @@ function StartEditor(Editor: PCodeEditor; FileName: string): boolean;
 
 {$ifdef VESA}
 procedure InitVESAScreenModes;
+procedure DoneVESAScreenModes;
 {$endif}
 
 procedure NoDebugger;
@@ -577,14 +574,12 @@ const
      Load:    @TGDBWindow.Load;
      Store:   @TGDBWindow.Store
   );
-{$ifndef FVISION}
   RFPASCIIChart: TStreamRec = (
      ObjType: 1509;
      VmtLink: Ofs(TypeOf(TFPASCIIChart)^);
      Load:    @TFPASCIIChart.Load;
      Store:   @TFPASCIIChart.Store
   );
-{$endif FVISION}
   RProgramInfoWindow: TStreamRec = (
      ObjType: 1510;
      VmtLink: Ofs(TypeOf(TProgramInfoWindow)^);
@@ -977,7 +972,7 @@ begin
       S:=UpcaseStr(S);
       _Is:=AsmReservedWords[Idx]^.Search(@S,Item);
 {$ifdef i386}
-      if not _Is then
+      if not _Is and (Length(S)>1) then
         begin
           LastC:=S[Length(S)];
           if LastC in ['B','D','L','Q','S','T','V','W'] then
@@ -986,7 +981,7 @@ begin
               Dec(Idx);
               if (AsmReservedWords[Idx]<>nil) and (AsmReservedWords[Idx]^.Count<>0) then
                 _Is:=AsmReservedWords[Idx]^.Search(@S,Item);
-              if not _Is then
+              if not _Is and (Length(S)>1) then
                 begin
                   LastTwo:=S[Length(S)]+LastC;
                   if (LastTwo='BL') or
@@ -3880,7 +3875,6 @@ begin
   inherited HandleEvent(Event);
 end;
 
-{$ifndef FVISION}
 constructor TFPASCIIChart.Init;
 begin
   inherited Init;
@@ -3933,7 +3927,6 @@ begin
   ASCIIChart:=nil;
   inherited Done;
 end;
-{$endif FVISION}
 
 function TVideoModeListBox.GetText(Item: pointer; MaxLen: sw_integer): string;
 var P: PVideoMode;
@@ -4180,6 +4173,11 @@ begin
           RegisterVesaVideoMode(ML.Modes[I]);
     end;
 end;
+
+procedure DoneVESAScreenModes;
+begin
+  FreeVesaModes;
+end;
 {$endif}
 
 procedure NoDebugger;
@@ -4209,7 +4207,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.16  2002-05-24 21:15:31  pierre
+  Revision 1.17  2002-05-29 22:38:13  pierre
+   Asciitab now in fvision
+
+  Revision 1.16  2002/05/24 21:15:31  pierre
    * add FV suffix in About dialog if using FVision library
 
   Revision 1.15  2002/04/17 11:10:13  pierre