* Automatically support for fvision or old fv

This commit is contained in:
peter 2001-08-05 12:23:00 +00:00
parent 569a1dde72
commit 4f53ca7d23
10 changed files with 115 additions and 23 deletions

View File

@ -145,7 +145,6 @@ ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX
endif
endif
KL:=$(wildcard compiler/finput.*)
ifeq ($(wildcard compiler/finput.*),)
override FPCOPT+=-dCOMPILER_1_0
endif
@ -1218,6 +1217,9 @@ endif
clean_compiler clean testgdb postgdbinfo
clean: fpc_cleanall
distclean: clean compilerclean
ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
override COMPILER+=-dFVISION
endif
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
testgdb:
ifneq ($(GDBFOUND),0)

View File

@ -51,7 +51,6 @@ endif
# To detect 1.0.x compilers we look for finput.ppu. If this unit
# is not found then we include 1.0.x compiler
#
KL:=$(wildcard compiler/finput.*)
ifeq ($(wildcard compiler/finput.*),)
override FPCOPT+=-dCOMPILER_1_0
endif
@ -112,6 +111,13 @@ clean: fpc_cleanall
distclean: clean compilerclean
#
# FVision or old FV detection
#
ifneq ($(wildcard $(UNITDIR_FV)/fvconsts$(PPUEXT)),)
override COMPILER+=-dFVISION
endif
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
testgdb:

View File

@ -35,9 +35,13 @@ uses
{$endif fpc}
Dos,Objects,
BrowCol,
Drivers,Views,App,Dialogs,ColorSel,Menus,StdDlg,Validate,
Drivers,Views,App,Dialogs,
Menus,StdDlg,Validate,
{$ifdef EDITORS}Editors{$else}WEditor,WCEdit{$endif},
ASCIITab,Calc,
{$ifndef FVISION}
ColorSel,
ASCIITab,
{$endif FVISION}
WUtils,WViews,WHTMLScn,WHelp,
FPIDE,FPCalc,FPCompil,
FPIni,FPViews,FPConst,FPVars,FPUtils,FPHelp,FPSwitch,FPUsrScr,
@ -152,11 +156,12 @@ end;
procedure RegisterIDEObjects;
begin
RegisterApp;
RegisterAsciiTab;
RegisterCalc;
RegisterCodeComplete;
RegisterCodeTemplates;
{$ifndef FVISION}
RegisterColorSel;
RegisterAsciiTab;
{$endif FVISION}
RegisterDialogs;
{$ifdef EDITORS}
RegisterEditors;
@ -290,7 +295,10 @@ BEGIN
END.
{
$Log$
Revision 1.1 2001-08-04 11:30:22 peter
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:22 peter
* ide works now with both compiler versions
Revision 1.1.2.10 2001/03/27 12:39:27 pierre

View File

@ -415,12 +415,16 @@ begin
end;
hcASCIITableWindow:
begin
{$ifndef FVISION}
if ASCIIChart=nil then
begin
New(ASCIIChart, Init);
Desktop^.Insert(ASCIIChart);
end;
W:=ASCIIChart;
{$else FVISION}
W:=nil;
{$endif FVISION}
end;
end;
if W=nil then
@ -943,7 +947,10 @@ end;
END.
{
$Log$
Revision 1.1 2001-08-04 11:30:23 peter
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 works now with both compiler versions
Revision 1.1.2.8 2001/03/22 17:28:03 pierre

View File

@ -159,12 +159,15 @@ uses
FpDpAnsi,WConsts,
Video,Mouse,Keyboard,
Compiler,Version,
Dos,Memory,Menus,Dialogs,StdDlg,ColorSel,
{$ifdef FVISION}
FVConsts,
{$else}
Commands,HelpCtx,
{$endif}
Dos,Memory,Menus,Dialogs,StdDlg,
{$ifndef FVISION}
ColorSel,
{$endif FVISION}
Systems,
WUtils,WHlpView,WViews,WHTMLHlp,
FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompil,FPHelp,
@ -388,8 +391,14 @@ 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,
nil)))))))),
{$endif}
nil))))))
{$ifndef FVISION}
)
{$endif}
),
NewSubMenu(menu_options, hcOptionsMenu, NewMenu(
NewItem(menu_options_mode,'', kbNoKey, cmSwitchesMode, hcSwitchesMode,
NewItem(menu_options_compiler,'', kbNoKey, cmCompiler, hcCompiler,
@ -1155,7 +1164,10 @@ end;
END.
{
$Log$
Revision 1.2 2001-08-05 02:01:47 peter
Revision 1.3 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
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

View File

@ -1153,6 +1153,10 @@ begin
end;
procedure TIDEApp.Colors;
{$Ifdef FVISION}
begin
end;
{$else FVISION}
var D: PColorDialog;
begin
New(D, Init(AppPalette,
@ -1228,6 +1232,7 @@ begin
UpdateScreen(true);
end;
end;
{$endif FVISION}
procedure TIDEApp.OpenINI;
var D: PFileDialog;
@ -1280,7 +1285,10 @@ end;
{
$Log$
Revision 1.1 2001-08-04 11:30:23 peter
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 works now with both compiler versions
Revision 1.1.2.11 2001/08/02 14:20:40 pierre

View File

@ -24,6 +24,7 @@ end;
procedure TIDEApp.DoAsciiTable;
begin
{$ifndef FVISION}
if ASCIIChart=nil then
begin
New(ASCIIChart, Init);
@ -31,6 +32,7 @@ begin
end
else
ASCIIChart^.Focus;
{$endif FVISION}
end;
@ -352,7 +354,10 @@ end;
{
$Log$
Revision 1.1 2001-08-04 11:30:23 peter
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 works now with both compiler versions
Revision 1.1.2.7 2001/03/08 16:43:01 pierre

View File

@ -18,7 +18,10 @@ unit FPSymbol;
interface
uses Objects,Drivers,Views,Menus,Dialogs,Outline,
uses Objects,Drivers,Views,Menus,Dialogs,
{$ifndef FVISION}
Outline,
{$endif FVISION}
BrowCol,
WViews,
FPViews;
@ -124,6 +127,7 @@ type
function GetPalette: PPalette; virtual;
end;
{$ifndef FVISION}
PSymbolInheritanceView = ^TSymbolInheritanceView;
TSymbolInheritanceView = object(TOutlineViewer)
constructor Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
@ -142,6 +146,7 @@ type
Root : PObjectSymbol;
MyBW : PBrowserWindow;
end;
{$endif FVISION}
PBrowserTabItem = ^TBrowserTabItem;
TBrowserTabItem = record
@ -189,7 +194,9 @@ type
Sym : PSymbol;
ScopeView : PSymbolScopeView;
ReferenceView : PSymbolReferenceView;
{$ifndef FVISION}
InheritanceView: PSymbolInheritanceView;
{$endif FVISION}
MemInfoView : PSymbolMemInfoView;
UnitInfoText : PSymbolMemoView;
UnitInfoUsed : PSymbolScopeView;
@ -240,8 +247,10 @@ procedure CloseAllBrowsers;
(TypeOf(P^)=TypeOf(TSymbolScopeView)) or
(TypeOf(P^)=TypeOf(TSymbolReferenceView)) or
(TypeOf(P^)=TypeOf(TSymbolMemInfoView)) or
(TypeOf(P^)=TypeOf(TSymbolMemoView)) or
(TypeOf(P^)=TypeOf(TSymbolInheritanceView))) then
{$ifndef FVISION}
(TypeOf(P^)=TypeOf(TSymbolInheritanceView)) or
{$endif FVISION}
(TypeOf(P^)=TypeOf(TSymbolMemoView))) then
Message(P,evCommand,cmClose,nil);
end;
@ -1048,6 +1057,7 @@ end;
TSymbolInheritanceView
****************************************************************************}
{$ifndef FVISION}
constructor TSymbolInheritanceView.Init(var Bounds: TRect; AHScrollBar, AVScrollBar: PScrollBar; ARoot: PObjectSymbol);
begin
inherited Init(Bounds,AHScrollBar,AVScrollBar);
@ -1162,6 +1172,7 @@ begin
S^.GetText,S,nil,
S^.Items,S^.References,Anc,S^.MemInfo);
end;
{$endif FVISION}
{****************************************************************************
@ -1397,10 +1408,12 @@ begin
Insert(HSB);
VSB:=CreateVSB(R);
Insert(VSB);
{$ifndef FVISION}
New(InheritanceView, Init(R, HSB,VSB, AInheritance));
InheritanceView^.GrowMode:=gfGrowHiX+gfGrowHiY;
Insert(InheritanceView);
InheritanceView^.MyBW:=@Self;
{$endif FVISION}
end;
if assigned(AMemInfo) then
begin
@ -1491,11 +1504,16 @@ begin
New(PageTab, Init(R,
NewBrowserTabItem(label_browsertab_scope,ScopeView,
NewBrowserTabItem(label_browsertab_reference,ReferenceView,
{$ifndef FVISION}
NewBrowserTabItem(label_browsertab_inheritance,InheritanceView,
{$endif FVISION}
NewBrowserTabItem(label_browsertab_memory,MemInfoView,
NewBrowserTabItem(label_browsertab_unit,UnitInfo,
nil))
)))));
{$ifndef FVISION}
)
{$endif FVISION}
))));
PageTab^.GrowMode:=gfGrowHiX;
Insert(PageTab);
@ -1504,9 +1522,12 @@ begin
else
if assigned(ReferenceView) then
SelectTab(btReferences)
{$ifndef FVISION}
else
if assigned(InheritanceView) then
SelectTab(btInheritance);
SelectTab(btInheritance)
{$endif FVISION}
;
end;
destructor TBrowserWindow.Done;
@ -1721,8 +1742,10 @@ begin
Tabs:=Tabs or (1 shl btScope);
if assigned(ReferenceView) then
Tabs:=Tabs or (1 shl btReferences);
{$ifndef FVISION}
if assigned(InheritanceView) then
Tabs:=Tabs or (1 shl btInheritance);
{$endif FVISION}
if assigned(MemInfoView) then
Tabs:=Tabs or (1 shl btMemInfo);
if Assigned(Sym) then
@ -1789,7 +1812,10 @@ end;
END.
{
$Log$
Revision 1.2 2001-08-05 02:01:48 peter
Revision 1.3 2001-08-05 12:23:00 peter
* Automatically support for fvision or old fv
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

View File

@ -80,7 +80,9 @@ 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+
@ -112,7 +114,10 @@ implementation
END.
{
$Log$
Revision 1.1 2001-08-04 11:30:24 peter
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 works now with both compiler versions
Revision 1.1.2.5 2001/03/12 17:34:56 pierre

View File

@ -23,11 +23,13 @@ uses
Dos,Objects,Drivers,
{$ifdef FVISION}
FVConsts,
{$else}
{$else FVISION}
Commands,HelpCtx,
{$endif}
{$endif FVISION}
Views,Menus,Dialogs,App,Gadgets,
{$ifndef FVISION}
ASCIITAB,
{$endif FVISION}
WEditor,WCEdit,
WUtils,WHelp,WHlpView,WViews,WANSI,
Comphook,
@ -389,6 +391,7 @@ type
TitleST : PStaticText;
end;
{$ifndef FVISION}
PFPASCIIChart = ^TFPASCIIChart;
TFPASCIIChart = object(TASCIIChart)
constructor Init;
@ -397,6 +400,7 @@ type
procedure HandleEvent(var Event: TEvent); virtual;
destructor Done; virtual;
end;
{$endif FVISION}
PVideoModeListBox = ^TVideoModeListBox;
TVideoModeListBox = object(TDropDownListBox)
@ -572,12 +576,14 @@ 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)^);
@ -3842,6 +3848,7 @@ begin
inherited HandleEvent(Event);
end;
{$ifndef FVISION}
constructor TFPASCIIChart.Init;
begin
inherited Init;
@ -3894,6 +3901,7 @@ begin
ASCIIChart:=nil;
inherited Done;
end;
{$endif FVISION}
function TVideoModeListBox.GetText(Item: pointer; MaxLen: sw_integer): string;
var P: PVideoModeList;
@ -4152,7 +4160,9 @@ begin
RegisterType(RFPDesktop);
RegisterType(RGDBSourceEditor);
RegisterType(RGDBWindow);
{$ifndef FVISION}
RegisterType(RFPASCIIChart);
{$endif FVISION}
RegisterType(RProgramInfoWindow);
RegisterType(RFPDlgWindow);
end;
@ -4161,7 +4171,10 @@ end;
END.
{
$Log$
Revision 1.2 2001-08-05 02:01:48 peter
Revision 1.3 2001-08-05 12:23:01 peter
* Automatically support for fvision or old fv
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