--- Merging r19833 into '.':

U    ide/fpmingw.pas
--- Merging r19834 into '.':
U    ide/test.pas
U    ide/test1.pas
--- Merging r19837 into '.':
U    packages/fv/examples/Makefile.fpc
--- Merging r19838 into '.':
C    packages/fv/examples/Makefile
--- Merging r19839 into '.':
D    packages/fv/examples/platform.inc
--- Merging r19840 into '.':
U    packages/fv/examples/testapp.pas
--- Merging r19841 into '.':
U    packages/fv/src/asciitab.pas
--- Merging r19842 into '.':
G    ide/test1.pas
--- Merging r19843 into '.':
U    ide/fpredir.pas
--- Merging r19844 into '.':
U    ide/fpsymbol.pas
U    ide/weditor.pas
--- Merging r19929 into '.':
U    ide/fpvars.pas
U    ide/fpini.pas
Summary of conflicts:
  Text conflicts: 1

# revisions: 19833,19834,19837,19838,19839,19840,19841,19842,19843,19844,19929
------------------------------------------------------------------------
r19833 | pierre | 2011-12-12 17:49:49 +0100 (Mon, 12 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/fpmingw.pas

 Recent mingw64 does not seem to provide fctMsvcrtLongJmp
------------------------------------------------------------------------
------------------------------------------------------------------------
r19834 | pierre | 2011-12-12 17:50:29 +0100 (Mon, 12 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/test.pas
   M /trunk/ide/test1.pas

 + Add overloaded Testne function in test1 unit
------------------------------------------------------------------------
------------------------------------------------------------------------
r19837 | pierre | 2011-12-13 14:33:28 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/packages/fv/examples/Makefile.fpc

 Use platform.inc file from ../src directory
------------------------------------------------------------------------
------------------------------------------------------------------------
r19838 | pierre | 2011-12-13 14:34:16 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/packages/fv/examples/Makefile

 Use platform.inc file from ../src directory
------------------------------------------------------------------------
------------------------------------------------------------------------
r19839 | pierre | 2011-12-13 14:34:47 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   D /trunk/packages/fv/examples/platform.inc

 Remove platform.inc
------------------------------------------------------------------------
------------------------------------------------------------------------
r19840 | pierre | 2011-12-13 14:35:32 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/packages/fv/examples/testapp.pas

 Enable AsciiTable and fix compilation with -dDEBUG
------------------------------------------------------------------------
------------------------------------------------------------------------
r19841 | pierre | 2011-12-13 14:51:23 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/packages/fv/src/asciitab.pas

 Fix AsciiTab proble for powerpc64, InfoLong and InfoPtr are not equivalent
------------------------------------------------------------------------
------------------------------------------------------------------------
r19842 | pierre | 2011-12-13 16:09:57 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/test1.pas

 Remove junk in test1 source file from alst commit
------------------------------------------------------------------------
------------------------------------------------------------------------
r19843 | pierre | 2011-12-13 17:33:44 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/fpredir.pas

 Avoid wrong exitcode 512 of Grep for Unix
------------------------------------------------------------------------
------------------------------------------------------------------------
r19844 | pierre | 2011-12-13 17:36:15 +0100 (Tue, 13 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/fpsymbol.pas
   M /trunk/ide/weditor.pas

 * Do not use InfoLong as size can be different from InfoPtr used in Message
------------------------------------------------------------------------
------------------------------------------------------------------------
r19929 | florian | 2011-12-30 17:36:25 +0100 (Fri, 30 Dec 2011) | 1 line
Changed paths:
   M /trunk/ide/fpini.pas
   M /trunk/ide/fpvars.pas

* ide makes use of %APPDATA% if available to store configuration files, same logic as on unix, resolves #20870
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@20045 -

.gitattributes

@@ -2768,7 +2768,6 @@ packages/fv/Makefile svneol=native#text/plain
 packages/fv/Makefile.fpc svneol=native#text/plain
 packages/fv/examples/Makefile svneol=native#text/plain
 packages/fv/examples/Makefile.fpc svneol=native#text/plain
-packages/fv/examples/platform.inc svneol=native#text/plain
 packages/fv/examples/testapp.lpi svneol=native#text/plain
 packages/fv/examples/testapp.pas svneol=native#text/plain
 packages/fv/fpmake.pp svneol=native#text/plain

ide/fpini.pas

@@ -31,7 +31,7 @@ procedure SetPrinterDevice(const Device: string);
 
 implementation
 
-uses 
+uses
   Dos,Objects,Drivers,
   FVConsts,
   Version,
@@ -151,6 +151,24 @@ begin
   StartupDir:=CompleteDir(FExpand('.'));
 {$ifndef unix}
   IDEDir:=CompleteDir(DirOf(system.Paramstr(0)));
+{$ifdef WINDOWS}
+  SystemIDEDir:=IDEDir;
+  if GetEnv('APPDATA')<>'' then
+    begin
+      IDEdir:=CompleteDir(FExpand(GetEnv('APPDATA')+'/fp'));
+      If Not ExistsDir(IDEdir) Then
+        begin
+          IDEDir:=SystemIDEDir;
+          if Not ExistsDir(IDEDir) then
+            begin
+              if DirOf(system.paramstr(0))<>'' then
+                IDEDir:=CompleteDir(DirOf(system.ParamStr(0)))
+              else
+                IDEDir:=StartupDir;
+            end;
+        end;
+   end;
+{$endif WINDOWS}
 {$else}
   SystemIDEDir:=FExpand(DirOf(system.paramstr(0))+'../lib/fpc/'+version_string+'/ide/text');
   If Not ExistsDir(SystemIDEdir) Then
@@ -560,6 +578,15 @@ begin
         MkDir(FExpand('~/.fp'));
    end;
 {$endif Unix}
+{$ifdef WINDOWS}
+  if not FromSaveAs and (DirOf(IniFileName)=DirOf(SystemIDEDir)) and
+    (GetEnv('APPDATA')<>'') then
+    begin
+      IniFileName:=FExpand(GetEnv('APPDATA')+'/fp/'+IniName);
+      If not ExistsDir(DirOf(IniFileName)) then
+        MkDir(FExpand(GetEnv('APPDATA')+'/fp'));
+   end;
+{$endif WINDOWS}
   New(INIFile, Init(IniFileName));
   { Files }
   { avoid keeping old files }

ide/fpmingw.pas

@@ -45,7 +45,11 @@ var _imp__atexit : TAtExitFunction; Cvar; external;  // "true" atexit in mingw l
 var
  hMsvcrt : HModule = 0;
  free_Msvcrt : boolean;
+{$ifdef win32}
  fctMsvcrtLongJmp : pointer;cvar;external;
+{$else not win32}
+ fctMsvcrtLongJmp : pointer;cvar;
+{$endif not win32}
 
 function atexit(p:TCFunction):longint;cdecl; [public, alias : '_atexit'];
 

ide/fpredir.pas

@@ -791,16 +791,24 @@ end;
     var
       StoreInherit : BOOL;
 {$endif Windows}
-
+{$ifdef UNIX}
+    var
+      s : cint;
+{$endif}
   Begin
     SwapVectors;
 {$ifdef UNIX}
     IOStatus:=0;
     {We need to use fpsystem to get wildcard expansion and avoid being
-     interrupted by ctrl+c (SIGINT).};
-    ExecuteResult:=fpsystem(MaybeQuoted(FixPath(Progname))+' '+Comline);
-    if ExecuteResult<0 then
+     interrupted by ctrl+c (SIGINT).
+     But used wifexited and wexitstatus functions
+     to correctly interpret fpsystem reutrn value }
+     s:=fpsystem(MaybeQuoted(FixPath(Progname))+' '+Comline);
+     if wifexited(s) then
+       ExecuteResult:=wexitstatus(s)
+     else
       begin
+        ExecuteResult:=word(s);
         IOStatus:=(-ExecuteResult) and $7f;
         ExecuteResult:=((-ExecuteResult) and $ff00) shr 8;
       end;

ide/fpsymbol.pas

@@ -1789,7 +1789,7 @@ begin
         cmDebuggerStopped :
           begin
             if Assigned(DebuggerValue) and
-               (DebuggerValue^.GDBI<>Event.InfoLong) then
+               (DebuggerValue^.GDBI<>PtrInt(Event.InfoPtr)) then
               begin
                 If Assigned(ST^.Text) then
                   DisposeStr(ST^.Text);

ide/fpvars.pas

@@ -90,9 +90,9 @@ const ClipboardWindow  : PClipboardWindow = nil;
       ShowStatusOnError: boolean = true;
       StartupDir       : string = '.'+DirSep;
       IDEDir           : string = '.'+DirSep;
-{$ifdef Unix}
+{$if defined(WINDOWS) or defined(Unix)}
       SystemIDEDir     : string = '';
-{$endif Unix}
+{$endif defined(WINDOWS) or defined(Unix)}
       INIFileName      : string = ININame;
       SwitchesPath     : string = SwitchesName;
       CtrlMouseAction  : integer = acTopicSearch;

ide/test.pas

@@ -201,5 +201,10 @@ BEGIN
   dispose(X);
  { for i:=1 to 99 do
     Writeln('Line ',i); }
+  if (TestOne<>1) or (TestOne(5)<>5) or (TestOne('6')<>6) then
+    begin
+      Writeln('Error while testing TestOne function overloads');
+      RunError(200);
+    end;
   Halt(4);
 END.

ide/test1.pas

@@ -1,9 +1,36 @@
 unit test1;
 
+{$mode objfpc}
+
 { dummy unit for test of dbx stabs info PM }
 
 interface
 
+function TestOne : longint;
+function TestOne(val : longint) : longint; overload;
+function TestOne(val : string) : longint; overload;
+
+
 implementation
 
+function TestOne : longint;
+begin
+  result:=1;
+end;
+
+function TestOne(val : longint) : longint; overload;
+begin
+  result:=val;
+end;
+
+function TestOne(val : string) : longint; overload;
+var
+  value, error : longint;
+begin
+  system.val(val,value,error);
+  if error=0 then
+    result:=value
+  else
+    result:=-1;
+end;
 end.

ide/weditor.pas

@@ -6950,7 +6950,7 @@ begin
      evBroadcast :
            case Event.Command of
                    cminputlinelen : begin
-                                      if Event.InfoLong=0 then
+                                      if PtrInt(Event.InfoPtr)=0 then
                                         okbutton^.DisableCommands([cmok])
                                       else
                                         okbutton^.EnableCommands([cmok]);

packages/fv/examples/Makefile

@@ -475,6 +475,195 @@ endif
 ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_PROGRAMS+=testapp
 endif
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-nativent)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),i386-iphonesim)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-solaris)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-darwin)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),armeb-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),armeb-embedded)
+override COMPILER_INCLUDEDIR+=../src
+endif
+ifeq ($(FULL_TARGET),mipsel-linux)
+override COMPILER_INCLUDEDIR+=../src
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif

packages/fv/examples/Makefile.fpc

@@ -5,6 +5,9 @@
 [target]
 programs=testapp
 
+[compiler]
+includedir=../src
+
 [require]
 packages=fv
 

packages/fv/examples/platform.inc

@@ -1,369 +0,0 @@
-{***************[ PLATFORM INCLUDE UNIT ]******************}
-{                                                          }
-{    System independent INCLUDE file to sort PLATFORMS     }
-{                                                          }
-{    Parts Copyright (c) 1997 by Balazs Scheidler          }
-{    [email protected]                                     }
-{                                                          }
-{    Parts Copyright (c) 1999, 2000 by Leon de Boer        }
-{    [email protected]  - primary e-mail address       }
-{    [email protected] - backup e-mail address     }
-{                                                          }
-{****************[ THIS CODE IS FREEWARE ]*****************}
-{                                                          }
-{     This sourcecode is released for the purpose to       }
-{   promote the pascal language on all platforms. You may  }
-{   redistribute it and/or modify with the following       }
-{   DISCLAIMER.                                            }
-{                                                          }
-{     This SOURCE CODE is distributed "AS IS" WITHOUT      }
-{   WARRANTIES AS TO PERFORMANCE OF MERCHANTABILITY OR     }
-{   ANY OTHER WARRANTIES WHETHER EXPRESSED OR IMPLIED.     }
-{                                                          }
-{*****************[ SUPPORTED PLATFORMS ]******************}
-{     16 and 32 Bit compilers                              }
-{        DOS      - Turbo Pascal 7.0 +      (16 Bit)       }
-{        DPMI     - Turbo Pascal 7.0 +      (16 Bit)       }
-{                 - FPC 0.9912+ (GO32V2)    (32 Bit)       }
-{        WINDOWS  - Turbo Pascal 7.0 +      (16 Bit)       }
-{                 - Delphi 1.0+             (16 Bit)       }
-{        WIN95/NT - Delphi 2.0+             (32 Bit)       }
-{                 - Virtual Pascal 2.0+     (32 Bit)       }
-{                 - Speedsoft Sybil 2.0+    (32 Bit)       }
-{                 - FPC 0.9912+             (32 Bit)       }
-{        OS2      - Virtual Pascal 1.0+     (32 Bit)       }
-{                 - C'T patch to BP         (16 Bit)       }
-{        LINUX    - FPC 0.9912+             (32 Bit)       }
-{                                                          }
-{******************[ REVISION HISTORY ]********************}
-{  Version  Date      Who    Fix                           }
-{  -------  --------  ---    ----------------------------  }
-{  0.1     02 Jul 97  Bazsi  Initial implementation        }
-{  0.2     28 Aug 97  LdB    Fixed OS2 platform sort       }
-{  0.3     29 Aug 97  LdB    Added assembler type changes  }
-{  0.4     29 Aug 97  LdB    OS_DOS removed from WINDOWS   }
-{  0.5     23 Oct 97  LdB    Delphi & speed compilers      }
-{  0.6     05 May 98  LdB    Virtual Pascal 2.0 added      }
-{  0.7     19 May 98  LdB    Delphi 2/3 definitions added  }
-{  0.8     06 Aug 98  CEC    FPC only support fixed WIN32  }
-{  0.9     10 Aug 98  LdB    BP_VMTLink def/Undef added    }
-{  1.0     27 Aug 98  LdB    Atari, Mac etc not undef dos  }
-{  1.1     25 Oct 98  PfV    Delphi 4 definitions added    }
-{  1.2     06 Jun 99  LdB    Sybil 2.0 support added       }
-{  1.3     13 Jun 99  LdB    Sybil 2.0 undef BP_VMT link   }
-{  1.31    03 Nov 99  LdB    FPC windows defines WIN32     }
-{  1.32    04 Nov 99  LdB    Delphi 5 definitions added    }
-{  1.33    16 Oct 00  LdB    WIN32/WIN16 defines added     }
-{**********************************************************}
-
-{ ****************************************************************************
-
-   This include file defines some conditional defines to allow us to select
-   the compiler/platform/target in a consequent way.
-
-    OS_XXXX         The operating system used (XXXX may be one of:
-                       DOS, OS2, Linux, Windows, Go32)
-    PPC_XXXX        The compiler used: BP, FPK, Virtual, Speed
-    BIT_XX          The number of bits of the target platform: 16 or 32
-    PROC_XXXX       The mode of the target processor (Real or Protected)
-                    This shouldn't be used, except for i386 specific parts.
-    ASM_XXXX        This is the assembler type: BP, ISO-ANSI, FPK
-
- ****************************************************************************
-
-    This is how the IFDEF and UNDEF statements below should translate.
-
-
- PLATFORM  SYSTEM    COMPILER  COMP ID      CPU MODE        BITS    ASSEMBLER
- --------  ------    --------  -------      --------        ----    ---------
-
- DOS      OS_DOS      BP/TP7   PPC_BP       PROC_Real       BIT_16  ASM_BP
-
- DPMI     OS_DOS      BP/TP7   PPC_BP       PROC_Protected  BIT_16  ASM_BP
-                      FPC      PPC_FPC      PROC_Protected  BIT_32  ASM_FPC
-
- LINUX    OS_LINUX    FPC      PPC_FPC      PROC_Protected  BIT_32  ASM_FPC
-
- WINDOWS  OS_WINDOWS  BP/TP7   PPC_BP       PROC_Protected  BIT_16  ASM_BP
-                      DELPHI   PPC_DELPHI   PROC_Protected  BIT_16  ASM_BP
-                      DELPHI2  PPC_DELPHI2  PROC_Protected  BIT_16  ASM_BP
-
- WIN95/NT OS_WINDOWS  DELPHI2  PPC_DELPHI2  PROC_Protected  BIT_32  ASM_BP
-                      DELPHI3  PPC_DELPHI3  PROC_Protected  BIT_32  ASM_BP
-                      DELPHI4  PPC_DELPHI3  PROC_Protected  BIT_32  ASM_BP
-                      DELPHI5  PPC_DELPHI3  PROC_Protected  BIT_32  ASM_BP
-                      VIRTUAL  PPC_VIRTUAL  PROC_Protected  BIT 32  ASM_BP
-                      SYBIL2   PPC_SPEED    PROC_Protected  BIT_32  ASM_BP
-                      FPC      PPC_FPC      PROC_Protected  BIT_32  ASM_FPC
-
- OS2      OS_OS2      BPOS2    PPC_BPOS2    PROC_Protected  BIT_16  ASM_BP
-                      VIRTUAL  PPC_VIRTUAL  PROC_Protected  BIT_32  ASM_BP
-                      SPEED    PPC_SPEED    PROC_Protected  BIT_32  ASM_BP
-                      SYBIL2   PPC_SPEED    PROC_Protected  BIT_32  ASM_BP
-                      FPC      PPC_FPC      PROC_Protected  BIT_32  ASM_FPC
- ****************************************************************************}
-{****************************************************************************
-
-FOR ALL COMPILERS BP_VMTLink defined but FPC and Delphi3/Delphi4 undefine it
-
- ****************************************************************************}
-{****************************************************************************
-
-FOR FPC THESE ARE THE TRANSLATIONS
-
-  PLATFORM  SYSTEM    COMPILER  HANDLE SIZE      ASM          CPU
- --------  ------    --------  -----------      ----         ---
-
- DOS      OS_DOS,OS_GO32 FPC     32-bit         AT&T         CPU86
-
- WIN32    OS_WINDOWS   FPC     32-bit           AT&T         ----
-
- LINUX    OS_LINUX     FPC     32-bit           AT&T         ----
-
- OS2      OS_OS2       FPC     ?????            AT&T         CPU86
-
- ATARI    OS_ATARI     FPC     32-bit           Internal     CPU68
-
- MACOS    OS_MAC       FPC     ?????            Internal     CPU68
-
- AMIGA    OS_AMIGA     FPC     32-bit           Internal     CPU68
-
- ****************************************************************************}
-
-{---------------------------------------------------------------------------}
-{  Initial assume BORLAND 16 BIT DOS COMPILER - Updated 27Aug98 LdB         }
-{---------------------------------------------------------------------------}
-{$DEFINE OS_DOS}
-{$DEFINE PROC_Real}
-{$DEFINE BIT_16}
-{$DEFINE PPC_BP}
-{$DEFINE ASM_BP}
-{$DEFINE BP_VMTLink}
-{$DEFINE CPU86}
-
-{---------------------------------------------------------------------------}
-{  BORLAND 16 BIT DPMI changes protected mode - Updated 27Aug98 LdB         }
-{---------------------------------------------------------------------------}
-{$IFDEF DPMI}
-  {$UNDEF PROC_Real}
-  {$DEFINE PROC_Protected}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  FPC 32 BIT COMPILER changes ASM, 32 bits etc - Updated 27Aug98 LdB       }
-{---------------------------------------------------------------------------}
-{$IFDEF FPC}
-  {$UNDEF PROC_Real}
-  {$DEFINE PROC_Protected}
-  {$UNDEF BIT_16}
-  {$DEFINE BIT_32}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_FPC}
-  {$UNDEF ASM_BP}
-  {$DEFINE ASM_FPC}
-  {$UNDEF BP_VMTLink}
-  {$DEFINE Use_API}
-  {$DEFINE NO_WINDOW}
-{$ENDIF}
-
-{$IFDEF NoAPI}
-{$UNDEF Use_API}
-{$UNDEF NO_WINDOW}
-{$ENDIF UseAPI}
-
-
-{---------------------------------------------------------------------------}
-{  FPC LINUX COMPILER changes operating system - Updated 27Aug98 LdB        }
-{  Note: Other linux compilers would need to change other details           }
-{---------------------------------------------------------------------------}
-{$IFDEF LINUX}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_LINUX}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  FPC GO32V2 COMPILER changes operating system - Updated 27Aug98 LdB       }
-{---------------------------------------------------------------------------}
-{$IFDEF GO32V2}
-  {$DEFINE OS_GO32}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  32 BIT WINDOWS COMPILERS changes bit size - Updated 27Aug98 LdB          }
-{---------------------------------------------------------------------------}
-{$IFDEF WIN32}
-  {$IFNDEF WINDOWS}
-    {$DEFINE WINDOWS}
-  {$ENDIF}
-  {$UNDEF BIT_16}
-  {$DEFINE BIT_32}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  WINDOWS COMPILERS change op system and proc mode - Updated 03Nov99 LdB   }
-{---------------------------------------------------------------------------}
-{$IFDEF WINDOWS}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_WINDOWS}
-  {$UNDEF PROC_Real}
-  {$DEFINE PROC_Protected}
-  {$IFDEF FPC}
-    {$DEFINE WIN32}
-  {$ENDIF}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  DELPHI1 COMPILER changes compiler type - Updated 27Aug98 LdB             }
-{---------------------------------------------------------------------------}
-{$IFDEF VER80}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_DELPHI}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  DELPHI2 COMPILER changes compiler type - Updated 27Aug98 LdB             }
-{---------------------------------------------------------------------------}
-{$IFDEF VER90}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_DELPHI}
-  {$DEFINE PPC_DELPHI2}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  DELPHI3 COMPILER changes compiler type - Updated 27Aug98 LdB             }
-{---------------------------------------------------------------------------}
-{$IFDEF VER100}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_DELPHI}
-  {$DEFINE PPC_DELPHI3}
-  {$UNDEF BP_VMTLink}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  DELPHI4 COMPILER changes compiler type - Updated 25Oct98 pfv             }
-{---------------------------------------------------------------------------}
-{$IFDEF VER120}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_DELPHI}
-  {$DEFINE PPC_DELPHI3}
-  {$DEFINE PPC_DELPHI4}
-  {$UNDEF BP_VMTLink}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  DELPHI5 COMPILER changes compiler type - Updated 04Nov99 pfv             }
-{---------------------------------------------------------------------------}
-{$IFDEF VER130}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_DELPHI}
-  {$DEFINE PPC_DELPHI3}
-  {$DEFINE PPC_DELPHI4}
-  {$DEFINE PPC_DELPHI5}
-  {$UNDEF BP_VMTLink}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  OS2 COMPILERS change compiler type and mode - Updated 27Aug98 LdB        }
-{  Note: Assumes BPOS2 16BIT OS2 patch except for FPC which undefines this  }
-{---------------------------------------------------------------------------}
-{$IFDEF OS2}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_OS2}
-  {$UNDEF PROC_Real}
-  {$DEFINE PROC_Protected}
-  {$UNDEF PPC_BP}
-  {$DEFINE PPC_BPOS2}
-  {$IFDEF FPC}
-    {$UNDEF PPC_BPOS2}
-  {$ENDIF}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  VIRTUAL PASCAL changes compiler type/32 bit - Updated 27Aug98 LdB        }
-{  Note: VP2 can compile win 32 code so changes op system as needed         }
-{---------------------------------------------------------------------------}
-{$IFDEF VirtualPascal}
-  {$UNDEF BIT_16}
-  {$DEFINE BIT_32}
-  {$IFDEF PPC_BPOS2}
-    {$UNDEF PPC_BPOS2}
-  {$ENDIF}
-  {$DEFINE PPC_VIRTUAL}
-  {$IFDEF WIN32}
-    {$UNDEF PPC_BP}
-    {$UNDEF OS_OS2}
-    {$DEFINE OS_WINDOWS}
-  {$ENDIF}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  SPEED COMPILER changes compiler type/32 bit  - Updated 27Aug98 LdB       }
-{---------------------------------------------------------------------------}
-{$IFDEF Speed}
-  {$UNDEF BIT_16}
-  {$DEFINE BIT_32}
-  {$UNDEF PPC_BPOS2}
-  {$DEFINE PPC_SPEED}
-  {$UNDEF BP_VMTLink}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  FPC AMIGA COMPILER changes op system and CPU type - Updated 27Aug98 LdB  }
-{---------------------------------------------------------------------------}
-{$IFDEF AMIGA}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_AMIGA}
-  {$IFDEF CPU86}
-    {$UNDEF CPU86}
-  {$ENDIF}
-  {$IFNDEF CPU68}
-    {$DEFINE CPU68}
-  {$ENDIF}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  FPC ATARI COMPILER changes op system and CPU type - Updated 27Aug98 LdB  }
-{---------------------------------------------------------------------------}
-{$IFDEF ATARI}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_ATARI}
-  {$IFDEF CPU86}
-    {$UNDEF CPU86}
-  {$ENDIF}
-  {$IFNDEF CPU68}
-    {$DEFINE CPU68}
-  {$ENDIF}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  FPC MAC COMPILER changes op system and CPU type - Updated 27Aug98 LdB    }
-{---------------------------------------------------------------------------}
-{$IFDEF MACOS}
-  {$UNDEF OS_DOS}
-  {$DEFINE OS_MAC}
-  {$IFDEF CPU86}
-    {$UNDEF CPU86}
-  {$ENDIF}
-  {$IFNDEF CPU68}
-    {$DEFINE CPU68}
-  {$ENDIF}
-{$ENDIF}
-
-{$IFDEF OS_DOS}
-  {$DEFINE NO_WINDOW}
-{$ENDIF}
-
-{---------------------------------------------------------------------------}
-{  WIN16 AND WIN32 set if in windows - Updated 16Oct2000 LdB                }
-{---------------------------------------------------------------------------}
-{$IFDEF OS_WINDOWS}                                   { WINDOWS SYSTEM }
-  {$IFDEF BIT_16}
-    {$DEFINE WIN16}                                   { 16 BIT WINDOWS }
-  {$ENDIF}
-  {$IFDEF BIT_32}
-    {$DEFINE WIN32}                                   { 32 BIT WINDOWS }
-  {$ENDIF}
-{$ENDIF}
-
-
-

packages/fv/examples/testapp.pas

@@ -35,19 +35,13 @@ PROGRAM testapp;
 {    follow in windows.                                                 }
 { ****************************** END REMARK *** Leon de Boer, 06Nov99 * }
 
-{$I Platform.inc}
+{$I platform.inc}
   USES
 {$IFDEF OS2PM}
      {$IFDEF OS_OS2} Os2Def, os2PmApi,  {$ENDIF}
 {$ENDIF OS2PM}
      Objects, Drivers, Views, Editors, Menus, Dialogs, App,             { Standard GFV units }
-     FVConsts,
-     {$ifdef TEST}
-     AsciiTab,
-     {$endif TEST}
-     {$ifdef DEBUG}
-     Gfvgraph,
-     {$endif DEBUG}
+     FVConsts, AsciiTab,
      Gadgets, TimedDlg, MsgBox, StdDlg;
 
 
@@ -61,6 +55,10 @@ CONST cmAppToolbar = 1000;
       cmCloseWindow2    = 1102;
       cmCloseWindow3    = 1103;
 
+{$ifdef DEBUG}
+CONST
+     WriteDebugInfo : boolean = true;
+{$endif DEBUG}
 
 {---------------------------------------------------------------------------}
 {          TTestAppp OBJECT - STANDARD APPLICATION WITH MENU                }
@@ -75,9 +73,7 @@ TYPE
         Clock: PClockView;
         Heap: PHeapView;
         P1,P2,P3 : PGroup;
-     {$ifdef TEST}
         ASCIIChart : PAsciiChart;
-     {$endif TEST}
       CONSTRUCTOR Init;
       PROCEDURE Idle; Virtual;
       PROCEDURE HandleEvent(var Event : TEvent);virtual;
@@ -297,7 +293,6 @@ END;
 
 PROCEDURE TTvDemo.AsciiWindow;
 begin
-{$ifdef TEST}
   if ASCIIChart=nil then
     begin
       New(ASCIIChart, Init);
@@ -305,7 +300,6 @@ begin
     end
   else
     ASCIIChart^.Focus;
-{$endif TEST}
 end;
 
 PROCEDURE TTVDemo.ShowAboutBox;

packages/fv/src/asciitab.pas

@@ -183,7 +183,7 @@ var
     DrawCurPos(true);
     ClearEvent(Event);
   end;
-  
+
 begin
   case Event.What of
     evMouseDown :
@@ -249,7 +249,7 @@ begin
   if (Event.what=evCommand) and
      (Event.Command =  AsciiTableCommandBase) then
     begin
-      AsciiChar:=Event.InfoLong;
+      AsciiChar:=PtrInt(Event.InfoPtr);
       Draw;
       ClearEvent(Event);
     end