From 70c63623e612667b396e70f480c9d0acd093100a Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 19 Dec 2000 11:59:12 +0000 Subject: [PATCH] * Fixes from Peter --- rtl/win32/graph.pp | 13 ++++++++----- rtl/win32/win32.inc | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/rtl/win32/graph.pp b/rtl/win32/graph.pp index 04d4394b19..80da8b6f29 100644 --- a/rtl/win32/graph.pp +++ b/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 -} \ No newline at end of file +} diff --git a/rtl/win32/win32.inc b/rtl/win32/win32.inc index d530a43ac5..99e923728c 100644 --- a/rtl/win32/win32.inc +++ b/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 }