diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index cabde84a28..c383c3d30c 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -279,9 +279,10 @@ type protected class procedure WSRegisterClass; override; procedure DoAddDockClient(Client: TControl; const ARect: TRect); override; + procedure DockOver(Source: TDragDockObject; X, Y: Integer; + State: TDragState; var Accept: Boolean); override; procedure DoRemoveDockClient(Client: TControl); override; function DoUndockClientMsg(NewTarget, Client: TControl):boolean; override; - procedure PositionDockRect(DragDockObject: TDragDockObject); override; public constructor Create(TheOwner: TComponent); override; function FindNextPage(CurPage: TTabSheet; diff --git a/lcl/include/pagecontrol.inc b/lcl/include/pagecontrol.inc index 55b3fcf7b1..edeb865b84 100644 --- a/lcl/include/pagecontrol.inc +++ b/lcl/include/pagecontrol.inc @@ -95,6 +95,16 @@ begin end; end; +procedure TPageControl.DockOver(Source: TDragDockObject; X, Y: Integer; + State: TDragState; var Accept: Boolean); +var + P: TPoint; +begin + P := Parent.ClientToScreen(Point(Left, Top)); + Source.DockRect := Rect(P.X, P.Y, P.X + Width, P.Y + Height); + DoDockOver(Source, X, Y, State, Accept); +end; + procedure TPageControl.DoRemoveDockClient(Client: TControl); begin // we cannot search for client page here since Client.Parent @@ -108,14 +118,6 @@ begin Result := inherited DoUndockClientMsg(NewTarget, Client); end; -procedure TPageControl.PositionDockRect(DragDockObject: TDragDockObject); -var - P: TPoint; -begin - P := Parent.ClientToScreen(Point(Left, Top)); - DragDockObject.DockRect := Rect(P.X, P.Y, P.X + Width, P.Y + Height); -end; - constructor TPageControl.Create(TheOwner: TComponent); begin PageClass:=TTabSheet; diff --git a/lcl/interfaces/gtk/gtkwsstdctrls.pp b/lcl/interfaces/gtk/gtkwsstdctrls.pp index 725639e633..e219849cc9 100644 --- a/lcl/interfaces/gtk/gtkwsstdctrls.pp +++ b/lcl/interfaces/gtk/gtkwsstdctrls.pp @@ -1942,7 +1942,7 @@ begin {$else} EventBox := gtk_event_box_new; gtk_event_box_set_visible_window(PGtkEventBox(EventBox), False); - TempWidget := CreateFixedClientWidget(false); + TempWidget := CreateFixedClientWidget(False); gtk_container_add(GTK_CONTAINER(EventBox), TempWidget); gtk_container_add(GTK_CONTAINER(p), EventBox); gtk_widget_show(EventBox);