Browse Source

* win32 fixes

peter 26 years ago
parent
commit
e98b8c7546
3 changed files with 129 additions and 32 deletions
  1. 26 1
      ide/fake/compiler/browcol.pas
  2. 73 15
      ide/text/fpredir.pas
  3. 30 16
      ide/text/globdir.inc

+ 26 - 1
ide/fake/compiler/browcol.pas

@@ -137,6 +137,9 @@ function SearchObjectForSymbol(O: PSymbol): PObjectSymbol;
 procedure InitBrowserCol;
 procedure DoneBrowserCol;
 
+function  LoadBrowserCol(S: PStream): boolean;
+procedure StoreBrowserCol(S: PStream);
+procedure RegisterSymbols;
 
 implementation
 
@@ -225,6 +228,7 @@ end;
 
 function TObjectSymbolCollection.At(Index: Sw_Integer): PObjectSymbol;
 begin
+  At:=nil;
 end;
 
 function TObjectSymbolCollection.Compare(Key1, Key2: Pointer): Sw_Integer;
@@ -322,6 +326,7 @@ end;
 
 function TObjectSymbol.GetName: string;
 begin
+  GetName:='';
 end;
 
 function TObjectSymbol.GetDescendantCount: sw_integer;
@@ -358,6 +363,23 @@ begin
 end;
 
 
+{*****************************************************************************
+                                 Load/Store
+*****************************************************************************}
+
+function  LoadBrowserCol(S: PStream): boolean;
+begin
+  LoadBrowserCol:=true;
+end;
+
+procedure StoreBrowserCol(S: PStream);
+begin
+end;
+
+procedure RegisterSymbols;
+begin
+end;
+
 
 {*****************************************************************************
                                  Initialize
@@ -407,7 +429,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  1999-04-07 21:55:39  peter
+  Revision 1.3  1999-08-05 16:54:35  peter
+    * win32 fixes
+
+  Revision 1.2  1999/04/07 21:55:39  peter
     + object support for browser
     * html help fixes
     * more desktop saving things

+ 73 - 15
ide/text/fpredir.pas

@@ -5,7 +5,7 @@
 
     Unit to redirect output and error to files
 
-    Adapted from code donated to public domain by Schwartz Gabriel.   20/03/1993.
+    Adapted from code donated to public domain by Schwartz Gabriel 20/03/1993
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -74,6 +74,12 @@ Uses
 {$endif linux}
   dos;
 
+var
+  FIN,FOUT,FERR     : ^File;
+  RedirChangedOut,
+  RedirChangedIn    : Boolean;
+  RedirChangedError : Boolean;
+  InRedirDisabled,OutRedirDisabled,ErrorRedirDisabled : Boolean;
 
 {*****************************************************************************
                                      Dos
@@ -108,11 +114,6 @@ Var
 {$endif TP}
 
 var
-  FIN,FOUT,FERR     : ^File;
-  RedirChangedOut,
-  RedirChangedIn    : Boolean;
-  RedirChangedError : Boolean;
-  InRedirDisabled,OutRedirDisabled,ErrorRedirDisabled : Boolean;
   TempHOut, TempHIn,TempHError : longint;
 
 { For linux the following functions exist
@@ -536,33 +537,87 @@ end;
                                  Linux
 *****************************************************************************}
 
-function ExecuteRedir (Const ProgName, ComLine, RedirStdOut, RedirStdErr : String) : boolean;
+function ExecuteRedir (Const ProgName, ComLine, RedirStdIn, RedirStdOut, RedirStdErr : String) : boolean;
 begin
   ExecuteRedir:=false;
 end;
 
-function ChangeRedir(Const Redir : String; AppendToFile : Boolean) : Boolean;
+function  ChangeRedirOut(Const Redir : String; AppendToFile : Boolean) : Boolean;
+begin
+  ChangeRedirOut:=false;
+end;
+
+
+procedure RestoreRedirOut;
+begin
+end;
+
+
+procedure DisableRedirOut;
+begin
+end;
+
+
+procedure EnableRedirOut;
 begin
-  ChangeRedir:=false;
 end;
 
-procedure RestoreRedir;
+
+function  ChangeRedirIn(Const Redir : String) : Boolean;
 begin
+  ChangeRedirIn:=false;
 end;
 
-function ChangeErrorRedir(Const Redir : String; AppendToFile : Boolean) : Boolean;
+
+procedure RestoreRedirIn;
 begin
-  ChangeErrorRedir:=false;
 end;
 
-procedure RestoreErrorRedir;
+
+procedure DisableRedirIn;
 begin
 end;
 
-procedure InitRedir;
+
+procedure EnableRedirIn;
+begin
+end;
+
+
+function  ChangeRedirError(Const Redir : String; AppendToFile : Boolean) : Boolean;
+begin
+  ChangeRedirError:=false;
+end;
+
+
+procedure RestoreRedirError;
+begin
+end;
+
+
+procedure DisableRedirError;
+begin
+end;
+
+
+procedure EnableRedirError;
+begin
+end;
+
+
+procedure RedirDisableAll;
+begin
+end;
+
+
+procedure RedirEnableAll;
 begin
 end;
 
+
+procedure InitRedir;
+begin
+end;
 {$endif not implemented}
 
 
@@ -585,7 +640,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.19  1999-08-03 20:22:36  peter
+  Revision 1.20  1999-08-05 16:54:36  peter
+    * win32 fixes
+
+  Revision 1.19  1999/08/03 20:22:36  peter
     + TTab acts now on Ctrl+Tab and Ctrl+Shift+Tab...
     + Desktop saving should work now
        - History saved

+ 30 - 16
ide/text/globdir.inc

@@ -11,22 +11,11 @@
 
  **********************************************************************}
 
-{ --- Exclude debugger support --- }
-{.$DEFINE NODEBUG}
-
-{ --- Text lines end with LF only --- }
-{$ifndef FPC}
+{ --- Special OS settings --- }
+{$ifdef TP}
+  {$define SUPPORTVESA}
   {$define TPUNIXLF}
-{$endif}
-
-{ --- Include VESA support --- }
-{$ifndef LINUX}
-  {$ifndef FV20}
-    {$define VESA}
-  {$endif}
-{$endif}
 
-{$ifdef TP}
   {$C FIXED PRELOAD PERMANENT}
   {
     Without defining this I got almost always SEGMENT NOT PRESENT (exc 11)
@@ -36,8 +25,33 @@
   }
 {$endif}
 
-{$ifndef debug}
-  {$ifndef linux}
+{$ifdef Go32V2}
+  {$define SUPPORTVESA}
+  {$define SUPPORTREDIR}
+{$endif}
+
+{$ifdef Linux}
+  {$undef SUPPORTVESA}
+  {$define SUPPORTREDIR}
+{$endif}
+
+{$ifdef Win32}
+  {$undef SUPPORTVESA}
+  {$undef SUPPORTREDIR}
+{$endif}
+
+{ --- Exclude debugger support --- }
+{.$DEFINE NODEBUG}
+
+{ --- Include VESA support --- }
+{$ifdef SUPPORTVESA}
+  {$ifndef FV20}
+    {$define VESA}
+  {$endif}
+{$endif}
+
+{$ifdef SUPPORTREDIR}
+  {$ifndef debug}
     {$define redircompiler}
   {$endif}
 {$endif}