diff --git a/components/turbopower_ipro/ipcss.inc b/components/turbopower_ipro/ipcss.inc index 550c7162cf..40203ff238 100644 --- a/components/turbopower_ipro/ipcss.inc +++ b/components/turbopower_ipro/ipcss.inc @@ -617,9 +617,9 @@ end; procedure TCSSReader.EatWhiteSpace; var Buf: char; - comment: integer; + //comment: integer; begin - comment:=0; + //comment:=0; while not EOF do begin Buf := char(FStream.ReadByte); diff --git a/components/turbopower_ipro/iphtml.pas b/components/turbopower_ipro/iphtml.pas index 5a1820f14f..0f5f4f3a11 100644 --- a/components/turbopower_ipro/iphtml.pas +++ b/components/turbopower_ipro/iphtml.pas @@ -769,7 +769,7 @@ type {$IFDEF IP_LAZARUS} FCSS: TCSSProps; FElementName: String; - FCSSPropsLoaded: boolean; + //FCSSPropsLoaded: boolean; {$ENDIF} FStyle: string; FClassId: string; @@ -14755,7 +14755,7 @@ function TIpHtmlNodeCore.GetFontSizeFromCSS(CurrentFontSize:Integer; var P: double; - ParentFSize: Integer; + //ParentFSize: Integer; begin result := CurrentFontSize; diff --git a/components/turbopower_ipro/ipstrms.pas b/components/turbopower_ipro/ipstrms.pas index 2d4bf69f12..00c9f3982a 100644 --- a/components/turbopower_ipro/ipstrms.pas +++ b/components/turbopower_ipro/ipstrms.pas @@ -1494,8 +1494,8 @@ begin end; {the item at L-2 will have the nearest smaller line number than the one we want; start here and read through the stream forwards} - CurLine := Longint(FLineIndex[L-2]); - Seek(Longint(FLineIndex[L-1]), soFromBeginning); + CurLine := Longint(PtrInt(FLineIndex[L-2])); + Seek(Longint(PtrInt(FLineIndex[L-1])), soFromBeginning); while true do begin atsGetLine(CurPos, EndPos, Len); inc(CurLine); diff --git a/examples/dragimagelist/unit1.lrs b/examples/dragimagelist/unit1.lrs index 4b0996c691..693d032ae4 100644 --- a/examples/dragimagelist/unit1.lrs +++ b/examples/dragimagelist/unit1.lrs @@ -1,5 +1,3 @@ -{ Это - файл ресурсов, автоматически созданный lazarus } - LazarusResources.Add('TForm1','FORMDATA',[ 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#175#0#5'Wi' +'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13 diff --git a/examples/dragimagelist/unit1.pas b/examples/dragimagelist/unit1.pas index 33ebcb324a..5ab6f27126 100644 --- a/examples/dragimagelist/unit1.pas +++ b/examples/dragimagelist/unit1.pas @@ -47,6 +47,8 @@ implementation procedure TForm1.Button1StartDrag(Sender: TObject; var DragObject: TDragObject); begin + // user started dragging on Button1 + // create our own TDragControlObject which provides an image. DragObject := TMyDragObject.Create(Sender as TControl); end; diff --git a/lcl/controls.pp b/lcl/controls.pp index ba07cd70c1..76fb33be6d 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -279,7 +279,7 @@ type FOldCursor: TCursor; FImageIndex: Integer; FLastDragPos: TPoint; - FLockedWindow: HWND; + FLockedWindow: HWND;// window where drag started and locked via DragLock, invalid=NoLockedWindow=High(PtrInt) procedure SetDragCursor(const AValue: TCursor); protected procedure Initialize; override; diff --git a/lcl/include/dragimagelist.inc b/lcl/include/dragimagelist.inc index 585da5c64f..a029966640 100644 --- a/lcl/include/dragimagelist.inc +++ b/lcl/include/dragimagelist.inc @@ -58,15 +58,15 @@ end; } function TDragImageList.BeginDrag(Window: HWND; X, Y: Integer): Boolean; begin - Result := TWsDragImageListClass(WidgetSetClass).BeginDrag(Self, Window, - FImageIndex, FDragHotspot.X, FDragHotspot.Y); - FDragging := Result; - if Result then - begin - DragLock(Window, X, Y); - FOldCursor := Screen.Cursor; - WidgetSet.SetCursor(Screen.Cursors[DragCursor]) - end; + Result := TWsDragImageListClass(WidgetSetClass).BeginDrag(Self, Window, + FImageIndex, FDragHotspot.X, FDragHotspot.Y); + FDragging := Result; + if Result then + begin + DragLock(Window, X, Y); + FOldCursor := Screen.Cursor; + WidgetSet.SetCursor(Screen.Cursors[DragCursor]) + end; end; { @@ -91,7 +91,7 @@ begin XPos, YPos, True); if Result then FLastDragPos := Point(XPos, YPos); - end; + end; end; {