Browse Source

* Remove Float type, use Single instead

peter 23 years ago
parent
commit
244a20c239

+ 16 - 13
rtl/win32/opengl32.pp

@@ -22,13 +22,13 @@ unit opengl32;
 
     function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL;
 
-    function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-             _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
+    function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+             _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
 
     function wglUseFontBitmapsA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL;
 
-    function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-               _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
+    function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+               _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
 
     function wglCreateContext(_para1:HDC):HGLRC;
 
@@ -62,20 +62,20 @@ unit opengl32;
 
     function wglUseFontBitmapsW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL;
 
-    function wglUseFontOutlinesW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-               _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
+    function wglUseFontOutlinesW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+               _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
 
   implementation
 
     function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsA';
 
-    function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-             _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA';
+    function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+             _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA';
 
     function wglUseFontBitmapsA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsA';
 
-    function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-               _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA';
+    function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+               _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA';
 
     function wglCreateContext(_para1:HDC):HGLRC; external 'opengl32' name 'wglCreateContext';
 
@@ -107,13 +107,16 @@ unit opengl32;
 
     function wglUseFontBitmapsW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsW';
 
-    function wglUseFontOutlinesW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
-               _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesW';
+    function wglUseFontOutlinesW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:Single;
+               _para6:Single; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesW';
 
 end.
 {
   $Log$
-  Revision 1.3  2002-09-07 16:01:29  peter
+  Revision 1.4  2002-09-15 17:53:44  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.3  2002/09/07 16:01:29  peter
     * old logs removed and tabs fixed
 
 }

+ 5 - 2
rtl/win32/wininc/ascdef.inc

@@ -294,7 +294,7 @@ function EnumFontFamilies(_para1:HDC; _para2:LPCSTR; _para3:FONTENUMPROC; _para4
 function EnumFonts(_para1:HDC; _para2:LPCSTR; _para3:ENUMFONTSPROC; _para4:LPARAM):longint; external 'gdi32' name 'EnumFontsA';
 function GetCharWidth(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidthA';
 function GetCharWidth32(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidth32A';
-function GetCharWidthFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PFLOAT):WINBOOL; external 'gdi32' name 'GetCharWidthFloatA';
+function GetCharWidthFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PSingle):WINBOOL; external 'gdi32' name 'GetCharWidthFloatA';
 function GetCharABCWidths(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABC):WINBOOL; external 'gdi32' name 'GetCharABCWidthsA';
 function GetCharABCWidthsFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL; external 'gdi32' name 'GetCharABCWidthsFloatA';
 function GetGlyphOutline(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;_para6:LPVOID; _para7:PMAT2):DWORD; external 'gdi32' name 'GetGlyphOutlineA';
@@ -490,7 +490,10 @@ end;
 
 {
   $Log$
-  Revision 1.6  2002-09-07 16:01:29  peter
+  Revision 1.7  2002-09-15 17:53:44  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.6  2002/09/07 16:01:29  peter
     * old logs removed and tabs fixed
 
   Revision 1.5  2002/05/09 08:31:43  carl

+ 5 - 2
rtl/win32/wininc/ascfun.inc

@@ -294,7 +294,7 @@ function EnumFontFamiliesA(_para1:HDC; _para2:LPCSTR; _para3:FONTENUMPROC; _para
 function EnumFontsA(_para1:HDC; _para2:LPCSTR; _para3:ENUMFONTSPROC; _para4:LPARAM):longint; external 'gdi32' name 'EnumFontsA';
 function GetCharWidthA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidthA';
 function GetCharWidth32A(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidth32A';
-function GetCharWidthFloatA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PFLOAT):WINBOOL; external 'gdi32' name 'GetCharWidthFloatA';
+function GetCharWidthFloatA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PSingle):WINBOOL; external 'gdi32' name 'GetCharWidthFloatA';
 function GetCharABCWidthsA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABC):WINBOOL; external 'gdi32' name 'GetCharABCWidthsA';
 function GetCharABCWidthsFloatA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL; external 'gdi32' name 'GetCharABCWidthsFloatA';
 function GetGlyphOutlineA(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;_para6:LPVOID; _para7:PMAT2):DWORD; external 'gdi32' name 'GetGlyphOutlineA';
@@ -491,7 +491,10 @@ end;
 
 {
   $Log$
-  Revision 1.6  2002-09-07 16:01:29  peter
+  Revision 1.7  2002-09-15 17:53:44  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.6  2002/09/07 16:01:29  peter
     * old logs removed and tabs fixed
 
   Revision 1.5  2002/05/09 08:31:43  carl

+ 4 - 5
rtl/win32/wininc/base.inc

@@ -79,8 +79,6 @@
      DWORDLONG  = qword;  { was unsigned long  }
      PDWORDLONG = ^DWORDLONG;
 
-     FLOAT = real;
-
      HANDLE = longint;    { or should it be cardinal ?? PM }
 
      HACCEL = HANDLE;
@@ -189,8 +187,6 @@
 
      PDWORD = ^DWORD;
 
-     PFLOAT = ^real;
-
      PHANDLE = ^HANDLE;
      PHKEY = ^HKEY;
 
@@ -944,7 +940,10 @@ type
 
 {
   $Log$
-  Revision 1.10  2002-09-07 16:01:30  peter
+  Revision 1.11  2002-09-15 17:53:45  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.10  2002/09/07 16:01:30  peter
     * old logs removed and tabs fixed
 
   Revision 1.9  2002/07/16 13:52:14  florian

+ 7 - 4
rtl/win32/wininc/func.inc

@@ -809,7 +809,7 @@ function PlayEnhMetaFileRecord(_para1:HDC; _para2:LPHANDLETABLE; var _para3:ENHM
 function SetEnhMetaFileBits(_para1:UINT; var _para2:BYTE):HENHMETAFILE; external 'gdi32' name 'SetEnhMetaFileBits';
 function SetWinMetaFileBits(_para1:UINT; var _para2:BYTE; _para3:HDC; var _para4:METAFILEPICT):HENHMETAFILE; external 'gdi32' name 'SetWinMetaFileBits';
 function GdiComment(_para1:HDC; _para2:UINT; var _para3:BYTE):WINBOOL; external 'gdi32' name 'GdiComment';
-function AngleArc(_para1:HDC; _para2:longint; _para3:longint; _para4:DWORD; _para5:FLOAT;_para6:FLOAT):WINBOOL; external 'gdi32' name 'AngleArc';
+function AngleArc(_para1:HDC; _para2:longint; _para3:longint; _para4:DWORD; _para5:Single;_para6:Single):WINBOOL; external 'gdi32' name 'AngleArc';
 function PolyPolyline(_para1:HDC; var _para2:POINT; var _para3:DWORD; _para4:DWORD):WINBOOL; external 'gdi32' name 'PolyPolyline';
 function GetWorldTransform(_para1:HDC; _para2:LPXFORM):WINBOOL; external 'gdi32' name 'GetWorldTransform';
 function SetWorldTransform(_para1:HDC; var _para2:XFORM):WINBOOL; external 'gdi32' name 'SetWorldTransform';
@@ -838,12 +838,12 @@ function PathToRegion(_para1:HDC):HRGN; external 'gdi32' name 'PathToRegion';
 function PolyDraw(_para1:HDC; var _para2:POINT; var _para3:BYTE; _para4:longint):WINBOOL; external 'gdi32' name 'PolyDraw';
 function SelectClipPath(_para1:HDC; _para2:longint):WINBOOL; external 'gdi32' name 'SelectClipPath';
 function SetArcDirection(_para1:HDC; _para2:longint):longint; external 'gdi32' name 'SetArcDirection';
-function SetMiterLimit(_para1:HDC; _para2:FLOAT; _para3:PFLOAT):WINBOOL; external 'gdi32' name 'SetMiterLimit';
+function SetMiterLimit(_para1:HDC; _para2:Single; _para3:PSingle):WINBOOL; external 'gdi32' name 'SetMiterLimit';
 function StrokeAndFillPath(_para1:HDC):WINBOOL; external 'gdi32' name 'StrokeAndFillPath';
 function StrokePath(_para1:HDC):WINBOOL; external 'gdi32' name 'StrokePath';
 function WidenPath(_para1:HDC):WINBOOL; external 'gdi32' name 'WidenPath';
 function ExtCreatePen(_para1:DWORD; _para2:DWORD; var _para3:LOGBRUSH; _para4:DWORD; var _para5:DWORD):HPEN; external 'gdi32' name 'ExtCreatePen';
-function GetMiterLimit(_para1:HDC; _para2:PFLOAT):WINBOOL; external 'gdi32' name 'GetMiterLimit';
+function GetMiterLimit(_para1:HDC; _para2:PSingle):WINBOOL; external 'gdi32' name 'GetMiterLimit';
 function GetArcDirection(_para1:HDC):longint; external 'gdi32' name 'GetArcDirection';
 function MoveToEx(_para1:HDC; _para2:longint; _para3:longint; _para4:LPPOINT):WINBOOL; external 'gdi32' name 'MoveToEx';
 function CreatePolygonRgn(var _para1:POINT; _para2:longint; _para3:longint):HRGN; external 'gdi32' name 'CreatePolygonRgn';
@@ -2299,7 +2299,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  2002-09-07 16:01:31  peter
+  Revision 1.10  2002-09-15 17:53:45  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.9  2002/09/07 16:01:31  peter
     * old logs removed and tabs fixed
 
   Revision 1.8  2002/09/03 10:26:11  pierre

+ 26 - 23
rtl/win32/wininc/struct.inc

@@ -68,9 +68,9 @@
      PABC = ^ABC;
 
      ABCFLOAT = record
-          abcfA : FLOAT;
-          abcfB : FLOAT;
-          abcfC : FLOAT;
+          abcfA : Single;
+          abcfB : Single;
+          abcfC : Single;
        end;
      LPABCFLOAT = ^ABCFLOAT;
      _ABCFLOAT = ABCFLOAT;
@@ -1989,8 +1989,8 @@
           emr : EMR;
           ptlCenter : POINTL;
           nRadius : DWORD;
-          eStartAngle : FLOAT;
-          eSweepAngle : FLOAT;
+          eStartAngle : Single;
+          eSweepAngle : Single;
        end;
      tagEMRANGLEARC = EMRANGLEARC;
      TEMRANGLEARC = EMRANGLEARC;
@@ -2019,12 +2019,12 @@
      PEMRPIE = ^EMRARC;
 
      XFORM = record
-          eM11 : FLOAT;
-          eM12 : FLOAT;
-          eM21 : FLOAT;
-          eM22 : FLOAT;
-          eDx : FLOAT;
-          eDy : FLOAT;
+          eM11 : Single;
+          eM12 : Single;
+          eM21 : Single;
+          eM22 : Single;
+          eDx : Single;
+          eDy : Single;
        end;
      LPXFORM = ^XFORM;
      _XFORM = XFORM;
@@ -2313,8 +2313,8 @@
           emr : EMR;
           rclBounds : RECTL;
           iGraphicsMode : DWORD;
-          exScale : FLOAT;
-          eyScale : FLOAT;
+          exScale : Single;
+          eyScale : Single;
           emrtext : EMRTEXT;
        end;
      tagEMREXTTEXTOUTA = EMREXTTEXTOUTA;
@@ -2606,8 +2606,8 @@
           emr : EMR;
           rclBounds : RECTL;
           iGraphicsMode : DWORD;
-          exScale : FLOAT;
-          eyScale : FLOAT;
+          exScale : Single;
+          eyScale : Single;
           cStrings : LONG;
           aemrtext : array[0..0] of EMRTEXT;
        end;
@@ -2751,7 +2751,7 @@
 
      EMRSETMITERLIMIT = record
           emr : EMR;
-          eMiterLimit : FLOAT;
+          eMiterLimit : Single;
        end;
      tagEMRSETMITERLIMIT = EMRSETMITERLIMIT;
      TEMRSETMITERLIMIT = EMRSETMITERLIMIT;
@@ -6234,19 +6234,19 @@
      { Structures for the extensions to OpenGL }
 
      POINTFLOAT = record
-          x : FLOAT;
-          y : FLOAT;
+          x : Single;
+          y : Single;
        end;
      _POINTFLOAT = POINTFLOAT;
      TPOINTFLOAT = POINTFLOAT;
      PPOINTFLOAT = ^POINTFLOAT;
 
      GLYPHMETRICSFLOAT = record
-          gmfBlackBoxX : FLOAT;
-          gmfBlackBoxY : FLOAT;
+          gmfBlackBoxX : Single;
+          gmfBlackBoxY : Single;
           gmfptGlyphOrigin : POINTFLOAT;
-          gmfCellIncX : FLOAT;
-          gmfCellIncY : FLOAT;
+          gmfCellIncX : Single;
+          gmfCellIncY : Single;
        end;
      LPGLYPHMETRICSFLOAT = ^GLYPHMETRICSFLOAT;
      _GLYPHMETRICSFLOAT = GLYPHMETRICSFLOAT;
@@ -7013,7 +7013,10 @@ type
 
 {
   $Log$
-  Revision 1.14  2002-09-07 16:01:32  peter
+  Revision 1.15  2002-09-15 17:53:45  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.14  2002/09/07 16:01:32  peter
     * old logs removed and tabs fixed
 
   Revision 1.13  2002/07/16 13:52:14  florian

+ 5 - 2
rtl/win32/wininc/unidef.inc

@@ -295,7 +295,7 @@ function EnumFontFamilies(_para1:HDC; _para2:LPCWSTR; _para3:FONTENUMPROC; _para
 function EnumFonts(_para1:HDC; _para2:LPCWSTR; _para3:ENUMFONTSPROC; _para4:LPARAM):longint; external 'gdi32' name 'EnumFontsW';
 function GetCharWidth(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidthW';
 function GetCharWidth32(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidth32W';
-function GetCharWidthFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PFLOAT):WINBOOL; external 'gdi32' name 'GetCharWidthFloatW';
+function GetCharWidthFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PSingle):WINBOOL; external 'gdi32' name 'GetCharWidthFloatW';
 function GetCharABCWidths(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABC):WINBOOL; external 'gdi32' name 'GetCharABCWidthsW';
 function GetCharABCWidthsFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL; external 'gdi32' name 'GetCharABCWidthsFloatW';
 function GetGlyphOutline(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;_para6:LPVOID; _para7:PMAT2):DWORD; external 'gdi32' name 'GetGlyphOutlineW';
@@ -494,7 +494,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2002-09-07 16:01:32  peter
+  Revision 1.6  2002-09-15 17:53:45  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.5  2002/09/07 16:01:32  peter
     * old logs removed and tabs fixed
 
   Revision 1.4  2002/01/19 11:58:22  peter

+ 5 - 2
rtl/win32/wininc/unifun.inc

@@ -295,7 +295,7 @@ function EnumFontFamiliesW(_para1:HDC; _para2:LPCWSTR; _para3:FONTENUMPROC; _par
 function EnumFontsW(_para1:HDC; _para2:LPCWSTR; _para3:ENUMFONTSPROC; _para4:LPARAM):longint; external 'gdi32' name 'EnumFontsW';
 function GetCharWidthW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidthW';
 function GetCharWidth32W(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPINT):WINBOOL; external 'gdi32' name 'GetCharWidth32W';
-function GetCharWidthFloatW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PFLOAT):WINBOOL; external 'gdi32' name 'GetCharWidthFloatW';
+function GetCharWidthFloatW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:PSingle):WINBOOL; external 'gdi32' name 'GetCharWidthFloatW';
 function GetCharABCWidthsW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABC):WINBOOL; external 'gdi32' name 'GetCharABCWidthsW';
 function GetCharABCWidthsFloatW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL; external 'gdi32' name 'GetCharABCWidthsFloatW';
 function GetGlyphOutlineW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;_para6:LPVOID; _para7:PMAT2):DWORD; external 'gdi32' name 'GetGlyphOutlineW';
@@ -494,7 +494,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2002-09-07 16:01:32  peter
+  Revision 1.6  2002-09-15 17:53:45  peter
+    * Remove Float type, use Single instead
+
+  Revision 1.5  2002/09/07 16:01:32  peter
     * old logs removed and tabs fixed
 
   Revision 1.4  2002/01/19 11:58:22  peter