* released -dnewmodes

rtl/inc/graph/graph.inc

@@ -126,9 +126,9 @@ var
   DriverName: String;
   DirectColor : Boolean ; { Is it a direct color mode? }
   ModeList : PModeInfo;
-{$ifdef newmodes}
+{$ifndef nonewmodes}
   newModeList: TNewModeInfo;
-{$endif newmodes}
+{$endif nonewmodes}
   DirectVideo : Boolean;  { Direct access to video memory? }
 
 
@@ -2174,7 +2174,7 @@ end;
   begin
     HiMode := -1;
     LoMode := -1;
-{$ifdef newmodes}
+{$ifndef nonewmodes}
     if not calledFromInitGraph or
        (graphDriver < lowNewDriver) or
        (graphDriver > highNewDriver) then
@@ -2225,7 +2225,7 @@ end;
         _GraphResult := grNotDetected;
         exit;
       end;
-{$else newmodes}
+{$else nonewmodes}
     { We start at VGA }
     GraphDriver := VGA;
     CpyMode := 0;
@@ -2251,7 +2251,7 @@ end;
         _GraphResult := grNotDetected;
         exit;
       end;
-{$endif newmodes}
+{$endif nonewmodes}
     _GraphResult := grOK;
     GraphDriver := CpyDriver;
     GraphMode := CpyMode;
@@ -2282,7 +2282,7 @@ end;
     DriverName:=InternalDriverName;   { DOS Graphics driver }
 
     if (Graphdriver=Detect)
-{$ifdef newmodes}
+{$ifndef nonewmodes}
        or (GraphMode = detectMode)
 {$endif}
        then
@@ -2356,7 +2356,7 @@ end;
        list:=list^.next;
        dispose(tmp);
      end;
-{$ifdef newmodes}
+{$ifndef nonewmodes}
    for c := lowNewDriver to highNewDriver do
      begin
        list := newModeList.modeinfo[c];
@@ -2367,7 +2367,7 @@ end;
            dispose(tmp);
          end;
      end;
-{$endif newmodes}
+{$endif nonewmodes}
 {$IFDEF DPMI}
   { We had copied the buffer of mode information }
   { and allocated it dynamically... now free it  }
@@ -2387,11 +2387,11 @@ begin
 {$endif logging}
  isgraphmode := false;
  ModeList := nil;
-{$ifdef newmodes}
+{$ifndef nonewmodes}
  fillChar(newModeList.modeinfo,sizeof(newModeList.modeinfo),#0);
  { lo and hi modenumber are -1 currently (no modes supported) }
  fillChar(newModeList.loHiModeNr,sizeof(newModeList.loHiModeNr),#255);
-{$endif newmodes}
+{$endif nonewmodes}
  SaveVideoState := nil;
  RestoreVideoState := nil;
 {$ifdef oldfont}
@@ -2430,7 +2430,10 @@ begin
 end;
 {
   $Log$
-  Revision 1.37  2000-06-23 19:56:37  jonas
+  Revision 1.38  2000-06-27 13:37:04  jonas
+    * released -dnewmodes
+
+  Revision 1.37  2000/06/23 19:56:37  jonas
     * setviewport was sometimes called with parameters from the previous
       active mode, either directly from setgraphmode or from
       setbkcolor

rtl/inc/graph/graphh.inc

@@ -329,7 +329,7 @@ type
        VGA           = 9;
        VESA          = 10;
 
-{$ifdef newmodes}
+{$ifndef nonewmodes}
 
        D1bit = 11;
        D2bit = 12;
@@ -345,7 +345,7 @@ type
 
        lowNewDriver = 11;
        highNewDriver = 21;
-{$endif newmodes}
+{$endif nonewmodes}
 
 
        { graph modes }
@@ -356,7 +356,7 @@ type
        VGAMed  = 1;
        VGAHi   = 2;
 
-{$ifdef newmodes}
+{$ifndef nonewmodes}
        { They start at such a high number to make sure they don't clash     }
        { with the mode numbers returned by getmoderange (those mode numbers }
        { are about the same modes, but all supported modes must have a      }
@@ -399,7 +399,7 @@ type
         (x:1280;y:1024),
         (x:1600;y:1200),
         (x:2048;y:1536));
-{$endif newmodes}
+{$endif nonewmodes}
 
 
        { Hercules mono card }
@@ -624,14 +624,14 @@ TYPE
       next: PModeInfo;
     end;
 
-{$ifdef newmodes}
+{$ifndef nonewmodes}
     TNewModeInfo = record
       modeInfo: array[lowNewDriver..highNewDriver] of PModeInfo;
       loHiModeNr: array[lowNewDriver..highNewDriver] of record
         lo,hi: smallint;
       end;
     end;
-{$endif newmodes}
+{$endif nonewmodes}
 
 
 
@@ -804,7 +804,10 @@ Function GetDriverName: string;
 
 {
   $Log$
-  Revision 1.9  2000-06-19 08:57:52  jonas
+  Revision 1.10  2000-06-27 13:37:04  jonas
+    * released -dnewmodes
+
+  Revision 1.9  2000/06/19 08:57:52  jonas
     * fixed newHighMode constant
 
   Revision 1.8  2000/06/19 01:18:19  carl

rtl/inc/graph/modes.inc

@@ -19,7 +19,7 @@
 {                          Internal routines                            }
 {-----------------------------------------------------------------------}
 
-{$ifdef newmodes}
+{$ifndef nonewmodes}
  procedure res2Mode(x, y, maxColor: longint; var driver,mode: smallInt);
  var
    l: longint;
@@ -67,7 +67,7 @@ begin
   x := resolutions[modeNr].x;
   y := resolutions[modeNr].y;
 end;
-{$endif newmodes}
+{$endif nonewmodes}
 
 
  procedure addmode(const mode: TModeInfo);
@@ -78,14 +78,14 @@ end;
   { modes. Duplicates are allowed.                         }
   {********************************************************}
   var
-{$ifdef newmodes}
+{$ifndef nonewmodes}
     driverNr, modeNr: smallint;
     prev: PModeInfo;
-{$endif newmodes}
+{$endif nonewmodes}
     list: PModeInfo;
     newlst : PModeInfo;
   begin
-{$ifdef newmodes}
+{$ifndef nonewmodes}
     res2Mode(mode.maxx+1,mode.maxy+1,mode.maxColor,driverNr,ModeNr);
     { bitdepth supported? }
     if (driverNr <> maxsmallint) then
@@ -171,7 +171,7 @@ end;
                 end;
             end;
         end;
-{$endif newmodes}
+{$endif nonewmodes}
     { TP-like mode stuff }
     if not assigned(ModeList) then
       begin
@@ -217,14 +217,14 @@ end;
   {********************************************************}
     var
      list, lastModeInfo: PModeInfo;
-{$ifdef newmodes}
+{$ifndef nonewmodes}
      x,y: longint;
 {$endif}
     begin
 {$ifdef logging}
       LogLn('Searching for driver '+strf(reqdriver)+' and mode '+strf(reqmode));
 {$endif logging}
-{$ifdef newmodes}
+{$ifndef nonewmodes}
       if (reqDriver >= lowNewDriver) and
          (reqDriver <= highNewDriver) then
         begin
@@ -280,7 +280,7 @@ end;
           end;
           exit;
         end;
-{$endif newmodes}
+{$endif nonewmodes}
        searchmode := nil;
        list := ModeList;
        If assigned(list) then
@@ -571,7 +571,10 @@ end;
 
 {
 $Log$
-Revision 1.27  2000-06-23 19:56:38  jonas
+Revision 1.28  2000-06-27 13:37:04  jonas
+  * released -dnewmodes
+
+Revision 1.27  2000/06/23 19:56:38  jonas
   * setviewport was sometimes called with parameters from the previous
     active mode, either directly from setgraphmode or from
     setbkcolor