diff --git a/ide/outputfilter.pas b/ide/outputfilter.pas index d9d98a053b..87aca3ac5e 100644 --- a/ide/outputfilter.pas +++ b/ide/outputfilter.pas @@ -432,6 +432,7 @@ begin MsgType:=ErrorTypeNameToType(copy(Line,StartPos,EndPos-StartPos)); Result:=true; end else if Line[EndPos]=')' then begin + // (123) : // (456) : in line (123) // read error type StartPos:=EndPos+2; @@ -440,7 +441,11 @@ begin MsgType:=ErrorTypeNameToType(copy(Line,StartPos,EndPos-StartPos)); // read second linenumber (more useful) while (EndPos<=length(Line)) and (Line[EndPos]<>'(') do inc(EndPos); - if EndPos>length(Line) then exit; + if EndPos>length(Line) then begin + // format: (123) : + Result:=true; + exit; + end; StartPos:=EndPos+1; EndPos:=StartPos; while (EndPos<=length(Line)) and (Line[EndPos] in ['0'..'9']) do inc(EndPos); diff --git a/lcl/interfaces/win32/win32winapi.inc b/lcl/interfaces/win32/win32winapi.inc index b7958b79b2..e102dae4ed 100644 --- a/lcl/interfaces/win32/win32winapi.inc +++ b/lcl/interfaces/win32/win32winapi.inc @@ -635,26 +635,20 @@ End; {------------------------------------------------------------------------------ Method: CreatePolygonRgn - Params: Points, NumPts, Winding + Params: Points, NumPts, FillMode Returns: the handle to the region Creates a Polygon, a closed many-sided shaped region. The Points parameter is - an array of points that give the vertices of the polygon. Winding determines - what points are going to be included in the region. When Winding is True, - points are selected by using the Winding fill algorithm. When Winding is - False, points are selected by using using the even-odd (alternative) fill + an array of points that give the vertices of the polygon. FillMode=Winding + determines what points are going to be included in the region. When Winding + is True, points are selected by using the Winding fill algorithm. When Winding + is False, points are selected by using using the even-odd (alternative) fill algorithm. NumPts indicates the number of points to use. The first point is always connected to the last point. ------------------------------------------------------------------------------} Function TWin32Object.CreatePolygonRgn(Points: PPoint; NumPts: Integer; - Winding : Boolean): HRGN; -var - fm : Longint; + FillMode: integer): HRGN; Begin - If Winding then - fm := Windows.Winding - else - fm := Windows.Alternate; Result := Windows.CreatePolygonRgn(LPPOINT(Points)^, NumPts, fm); End; @@ -2275,6 +2269,9 @@ end; { ============================================================================= $Log$ + Revision 1.25 2002/12/25 13:30:37 mattias + added more windows funcs and fixed jump to compiler error end of file + Revision 1.24 2002/11/26 20:51:05 mattias applied clipbrd patch from Vincent diff --git a/lcl/interfaces/win32/win32winapih.inc b/lcl/interfaces/win32/win32winapih.inc index 19e37cc335..078f289897 100644 --- a/lcl/interfaces/win32/win32winapih.inc +++ b/lcl/interfaces/win32/win32winapih.inc @@ -52,7 +52,7 @@ Function CreateFontIndirect(Const LogFont: TLogFont): HFONT; Override; Function CreatePenIndirect(Const LogPen: TLogPen): HPEN; Override; { Creates a bitmap from raw pixmap data } Function CreatePixmapIndirect(Const Data: Pointer; Const TransColor: LongInt): HBITMAP; Override; -Function CreatePolygonRgn(Points: PPoint; NumPts: Integer; Winding : Boolean): HRGN; Override; +Function CreatePolygonRgn(Points: PPoint; NumPts: Integer; FillMode: integer): HRGN; Override; Function CreateRectRgn(X1, Y1, X2, Y2: Integer): HRGN; Override; Function DeleteDC(HDC: HDC): Boolean; Override; @@ -170,6 +170,9 @@ Procedure DeleteCriticalSection(var CritSection: TCriticalSection); Override; { ============================================================================= $Log$ + Revision 1.17 2002/12/25 13:30:37 mattias + added more windows funcs and fixed jump to compiler error end of file + Revision 1.16 2002/11/23 13:48:49 mattias added Timer patch from Vincent Snijders diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp index 3f58984249..438a84e389 100644 --- a/lcl/lcltype.pp +++ b/lcl/lcltype.pp @@ -1302,15 +1302,20 @@ const { Text Alignment Options } TA_NOUPDATECP = 0; - TA_UPDATECP = 1; - TA_LEFT = 0; - TA_RIGHT = 2; - TA_CENTER = 6; - TA_TOP = 0; - TA_BOTTOM = 8; - TA_BASELINE = 24; + TA_UPDATECP = 1; + TA_LEFT = 0; + TA_RIGHT = 2; + TA_CENTER = 6; + TA_TOP = 0; + TA_BOTTOM = 8; + TA_BASELINE = 24; TA_RTLREADING = $100; TA_MASK = (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING); + + { PolyFill() Modes } + ALTERNATE = 1; + WINDING = 2; + POLYFILL_LAST = 2; type @@ -1754,6 +1759,9 @@ end. { $Log$ + Revision 1.30 2002/12/25 13:30:36 mattias + added more windows funcs and fixed jump to compiler error end of file + Revision 1.29 2002/12/25 10:21:05 mattias made Form.Close more Delphish, added some windows compatibility functions