2
0
peter 26 жил өмнө
parent
commit
980b0a5a24
2 өөрчлөгдсөн 22 нэмэгдсэн , 9 устгасан
  1. 13 8
      ide/text/fp.pas
  2. 9 1
      ide/text/fpcalc.pas

+ 13 - 8
ide/text/fp.pas

@@ -21,6 +21,9 @@ uses
 {$ifdef IDEHeapTrc}
   HeapTrc,
 {$endif IDEHeapTrc}
+{$ifdef go32v2}
+  ,dpmiexcp
+{$endif go32v2}
   Dos,Objects,
   BrowCol,
   Views,App,Dialogs,ColorSel,Menus,StdDlg,Validate,
@@ -29,11 +32,7 @@ uses
   WViews,
   FPIDE,FPCalc,FPCompile,
   FPIni,FPViews,FPConst,FPVars,FPUtils,FPHelp,FPSwitch,FPUsrScr,
-  FPTools,{$ifndef NODEBUG}FPDebug,{$endif}FPTemplt,FPCatch,FPRedir,FPDesk
-{$ifdef FPC}
-  ,dpmiexcp
-{$endif FPC}
-  ;
+  FPTools,{$ifndef NODEBUG}FPDebug,{$endif}FPTemplt,FPCatch,FPRedir,FPDesk;
 
 
 procedure ProcessParams(BeforeINI: boolean);
@@ -57,7 +56,11 @@ begin
         case Upcase(Param[1]) of
           'C' : { custom config file (BP compatiblity) }
            if BeforeINI then
-            INIPath:=copy(Param,2,255);
+            begin
+              if (length(Param)>=1) and (Param[1] in['=',':']) then
+                Delete(Param,1,1); { eat separator }
+              INIPath:=copy(Param,2,255);
+            end;
           'R' : { enter the directory last exited from (BP comp.) }
             begin
               Param:=copy(Param,2,255);
@@ -172,7 +175,6 @@ BEGIN
   DoneDesktopFile;
 
   MyApp.Done;
-
   WriteSwitches(SwitchesPath);
 
   DoneTemplates;
@@ -192,7 +194,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.24  1999-06-28 12:40:56  pierre
+  Revision 1.25  1999-06-28 19:25:34  peter
+    * fixes from gabor
+
+  Revision 1.24  1999/06/28 12:40:56  pierre
    + clear tool messages at exit
 
   Revision 1.23  1999/06/25 00:48:05  pierre

+ 9 - 1
ide/text/fpcalc.pas

@@ -13,6 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$I globdir.inc}
 unit FPCalc;
 
 interface
@@ -67,6 +68,7 @@ type
     procedure   Close; virtual;
   end;
 
+{$ifndef NOOBJREG}
 const
   RCalcButton: TStreamRec = (
      ObjType: 10139;
@@ -86,6 +88,7 @@ const
      Load:    @TCalculator.Load;
      Store:   @TCalculator.Store
   );
+{$endif}
 
 procedure RegisterFPCalc;
 
@@ -423,15 +426,20 @@ end;
 
 procedure RegisterFPCalc;
 begin
+{$ifndef NOOBJREG}
   RegisterType(RCalcButton);
   RegisterType(RCalcDisplay);
   RegisterType(RCalculator);
+{$endif}
 end;
 
 end.
 {
   $Log$
-  Revision 1.4  1999-04-07 21:55:41  peter
+  Revision 1.5  1999-06-28 19:25:35  peter
+    * fixes from gabor
+
+  Revision 1.4  1999/04/07 21:55:41  peter
     + object support for browser
     * html help fixes
     * more desktop saving things