paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-15 15:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fix problem with Alt-X (webbug 1959)

Browse Source 
+ use fpusrscr unit to restore console at exit.
This commit is contained in:
pierre 2003-01-22 13:42:35 +00:00
parent b230154c32
commit 739c92c1f7
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
installer/install.pas
View File

@ -58,6 +58,10 @@ program install;
{$endif} {$endif}
{$ifdef FPC}
{$define USE_FPUSRSCR}
{$endif FPC}
uses uses
{$IFDEF OS2} {$IFDEF OS2}
{$IFDEF FPC} {$IFDEF FPC}
@ -85,6 +89,9 @@ program install;
{$IFDEF DLL} {$IFDEF DLL}
unzipdll, unzipdll,
{$ENDIF} {$ENDIF}
{$ifdef USE_FPUSRSCR}
FPUsrScr,
{$endif USE_FPUSRSCR}
app,dialogs,views,menus,msgbox,colortxt,tabs,scroll, app,dialogs,views,menus,msgbox,colortxt,tabs,scroll,
WHTMLScn; WHTMLScn;
@ -178,6 +185,7 @@ program install;
pinstalldialog = ^tinstalldialog; pinstalldialog = ^tinstalldialog;
tinstalldialog = object(tdialog) tinstalldialog = object(tdialog)
constructor init; constructor init;
procedure handleevent(var event : tevent);virtual;
end; end;
PFPHTMLFileLinkScanner = ^TFPHTMLFileLinkScanner; PFPHTMLFileLinkScanner = ^TFPHTMLFileLinkScanner;
@ -1228,6 +1236,17 @@ program install;
Tab^.Select; Tab^.Select;
end; end;
procedure tinstalldialog.handleevent(var event : tevent);
begin
if event.what=evcommand then
if event.command=cmquit then
begin
putevent(event);
event.command:=cmCancel;
end;
inherited handleevent(event);
end;
{***************************************************************************** {*****************************************************************************
TSpecialInputLine TSpecialInputLine
@ -1828,6 +1847,11 @@ var
i : longint; i : longint;
begin begin
{$ifdef USE_FPUSRSCR}
InitUserScreen;
if Assigned(UserScreen) then
UserScreen^.SwitchBackToIDEScreen;
{$endif USE_FPUSRSCR}
{ register objects for help streaming } { register objects for help streaming }
RegisterWHTMLScan; RegisterWHTMLScan;
{$ifdef FPC} {$ifdef FPC}
@ -1915,12 +1939,21 @@ begin
{$endif} {$endif}
installapp.do_installdialog; installapp.do_installdialog;
installapp.done; installapp.done;
{$ifdef USE_FPUSRSCR}
if Assigned(UserScreen) then
UserScreen^.SwitchToConsoleScreen;
DoneUserScreen;
{$endif USE_FPUSRSCR}
if createlog then if createlog then
close(log); close(log);
end. end.
{ {
$Log$ $Log$
Revision 1.13 2002-09-07 15:40:59 peter Revision 1.14 2003-01-22 13:42:35 pierre
* fix problem with Alt-X (webbug 1959)
+ use fpusrscr unit to restore console at exit.
Revision 1.13 2002/09/07 15:40:59 peter
* old logs removed and tabs fixed * old logs removed and tabs fixed
Revision 1.12 2002/07/06 11:51:04 carl Revision 1.12 2002/07/06 11:51:04 carl