Browse Source

* Fixes from Peter

michael 25 years ago
parent
commit
70c63623e6
2 changed files with 17 additions and 11 deletions
  1. 8 5
      rtl/win32/graph.pp
  2. 9 6
      rtl/win32/win32.inc

+ 8 - 5
rtl/win32/graph.pp

@@ -1414,7 +1414,7 @@ end;
 
 var
    // here we can force the creation of a maximized window }
-   extrastyle : longint;
+   extrastyle : cardinal;
 
  { Create the Window Class }
 function WinCreate : HWnd;
@@ -1425,7 +1425,7 @@ begin
   if UseChildWindow then
     begin
        ParentWindow:=CreateWindow('FPCGraphWindowMain', windowtitle,
-                  WS_OVERLAPPEDWINDOW or WS_CLIPCHILDREN or extrastyle, CW_USEDEFAULT, 0,
+                  WS_OVERLAPPEDWINDOW or WS_CLIPCHILDREN or extrastyle, longint(CW_USEDEFAULT), 0,
                   maxx+ChildOffset.Left+ChildOffset.Right+1+
                     2*GetSystemMetrics(SM_CXFRAME),
                   maxy+ChildOffset.Top+ChildOffset.Bottom+1+
@@ -1455,7 +1455,7 @@ begin
   else
     begin
        hWindow:=CreateWindow('FPCGraphWindow', windowtitle,
-                  ws_OverlappedWindow or extrastyle, CW_USEDEFAULT, 0,
+                  ws_OverlappedWindow or extrastyle, longint(CW_USEDEFAULT), 0,
                   maxx+1+2*GetSystemMetrics(SM_CXFRAME),
                   maxy+1+2*GetSystemMetrics(SM_CYFRAME)+
                   GetSystemMetrics(SM_CYCAPTION),
@@ -2222,7 +2222,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.4  2000-11-14 19:45:08  florian
+  Revision 1.5  2000-12-19 11:59:12  michael
+  * Fixes from Peter
+
+  Revision 1.4  2000/11/14 19:45:08  florian
     * child window destruction fixed
 
   Revision 1.3  2000/10/21 18:20:17  florian
@@ -2234,4 +2237,4 @@ end.
   Revision 1.2  2000/07/13 11:33:57  michael
   + removed logs
 
-}
+}

+ 9 - 6
rtl/win32/win32.inc

@@ -16,13 +16,13 @@
 
 const
    { constants for GetStdHandle }
-   STD_INPUT_HANDLE = $fffffff6;
-   STD_OUTPUT_HANDLE = $fffffff5;
-   STD_ERROR_HANDLE = $fffffff4;
-   INVALID_HANDLE_VALUE = $ffffffff;
+   STD_INPUT_HANDLE = longint($fffffff6);
+   STD_OUTPUT_HANDLE = longint($fffffff5);
+   STD_ERROR_HANDLE = longint($fffffff4);
+   INVALID_HANDLE_VALUE = longint($ffffffff);
 
    IGNORE = 0;               { Ignore signal }
-   INFINITE = $FFFFFFFF;     { Infinite timeout }
+   INFINITE = longint($FFFFFFFF);     { Infinite timeout }
 
    { flags for CreateFile }
    GENERIC_READ=$80000000;
@@ -116,7 +116,10 @@ type
 
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:58  michael
+  Revision 1.3  2000-12-19 11:59:12  michael
+  * Fixes from Peter
+
+  Revision 1.2  2000/07/13 11:33:58  michael
   + removed logs
  
 }