diff --git a/lcl/interfaces/win32/win32wscalendar.pp b/lcl/interfaces/win32/win32wscalendar.pp
index 90e6522ced..5cf98d214c 100644
--- a/lcl/interfaces/win32/win32wscalendar.pp
+++ b/lcl/interfaces/win32/win32wscalendar.pp
@@ -48,7 +48,7 @@ type
     class function  CreateHandle(const AWinControl: TWinControl;
           const AParams: TCreateParams): HWND; override;
     class procedure AdaptBounds(const AWinControl: TWinControl;
-          var Left, Top, Width, Height: integer; var SuppressMove: boolean);
+          var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
     class function  GetDateTime(const ACalendar: TCustomCalendar): TDateTime; override;
     class procedure SetDateTime(const ACalendar: TCustomCalendar; const ADateTime: TDateTime); override;
     class procedure SetDisplaySettings(const ACalendar: TCustomCalendar; const ASettings: TDisplaySettings); override;
diff --git a/lcl/interfaces/win32/win32wscontrols.pp b/lcl/interfaces/win32/win32wscontrols.pp
index 2254217a47..b6b42aeba6 100644
--- a/lcl/interfaces/win32/win32wscontrols.pp
+++ b/lcl/interfaces/win32/win32wscontrols.pp
@@ -66,8 +66,6 @@ type
   protected
   public
     class procedure AddControl(const AControl: TControl); override;
-    class procedure AdaptBounds(const AWinControl: TWinControl;
-          var Left, Top, Width, Height: integer; var SuppressMove: boolean); virtual;
   
     class function  GetText(const AWinControl: TWinControl; var AText: String): Boolean; override;
     class procedure SetBounds(const AWinControl: TWinControl; const ALeft, ATop, AWidth, AHeight: Integer); override;
@@ -314,11 +312,6 @@ begin
   SetParent(ChildHandle, ParentHandle);
 end;
 
-procedure TWin32WSWinControl.AdaptBounds(const AWinControl: TWinControl;
-  var Left, Top, Width, Height: integer; var SuppressMove: boolean);
-begin
-end;
-
 function  TWin32WSWinControl.GetText(const AWinControl: TWinControl; var AText: String): Boolean;
 begin
   AText := '';
diff --git a/lcl/interfaces/win32/win32wsspin.pp b/lcl/interfaces/win32/win32wsspin.pp
index e2fbc4b6a2..b024127438 100644
--- a/lcl/interfaces/win32/win32wsspin.pp
+++ b/lcl/interfaces/win32/win32wsspin.pp
@@ -46,8 +46,8 @@ type
   private
   protected
   public
-    class function  AdaptBounds(const AWinControl: TWinControl;
-          var Left, Top, Width, Height: integer): boolean;
+    class procedure AdaptBounds(const AWinControl: TWinControl;
+          var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
     class function  CreateHandle(const AWinControl: TWinControl;
           const AParams: TCreateParams): HWND; override;
     class function  GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer; override;
@@ -117,8 +117,8 @@ begin
   Result := Params.Window;
 end;
 
-function  TWin32WSCustomSpinEdit.AdaptBounds(const AWinControl: TWinControl;
-  var Left, Top, Width, Height: integer): boolean;
+procedure TWin32WSCustomSpinEdit.AdaptBounds(const AWinControl: TWinControl;
+  var Left, Top, Width, Height: integer; var SuppressMove: boolean);
 var
   WinHandle, BuddyHandle: HWND;
 begin
@@ -128,7 +128,7 @@ begin
   MoveWindow(BuddyHandle, Left, Top, Width, Height, True);
   // reattach
   Windows.SendMessage(WinHandle, UDM_SETBUDDY, BuddyHandle, 0);
-  Result := true;
+  SuppressMove := true;
 end;
 
 function  TWin32WSCustomSpinEdit.GetSelStart(const ACustomSpinEdit: TCustomSpinEdit): integer;
diff --git a/lcl/interfaces/win32/win32wsstdctrls.pp b/lcl/interfaces/win32/win32wsstdctrls.pp
index dfff66b70b..6eea046f8c 100644
--- a/lcl/interfaces/win32/win32wsstdctrls.pp
+++ b/lcl/interfaces/win32/win32wsstdctrls.pp
@@ -60,7 +60,7 @@ type
     class function  CreateHandle(const AWinControl: TWinControl;
           const AParams: TCreateParams): HWND; override;
     class procedure AdaptBounds(const AWinControl: TWinControl;
-          var Left, Top, Width, Height: integer; var SuppressMove: boolean);
+          var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
   end;
 
   { TWin32WSGroupBox }
@@ -80,7 +80,7 @@ type
     class function  CreateHandle(const AWinControl: TWinControl;
           const AParams: TCreateParams): HWND; override;
     class procedure AdaptBounds(const AWinControl: TWinControl;
-          var Left, Top, Width, Height: integer; var SuppressMove: boolean);
+          var Left, Top, Width, Height: integer; var SuppressMove: boolean); override;
     class function  GetSelStart(const ACustomComboBox: TCustomComboBox): integer; override;
     class function  GetSelLength(const ACustomComboBox: TCustomComboBox): integer; override;
     class function  GetItemIndex(const ACustomComboBox: TCustomComboBox): integer; override;
diff --git a/lcl/widgetset/wscontrols.pp b/lcl/widgetset/wscontrols.pp
index 49108374e2..8e5dc68223 100644
--- a/lcl/widgetset/wscontrols.pp
+++ b/lcl/widgetset/wscontrols.pp
@@ -86,6 +86,9 @@ type
     class procedure SetSize(const AWinControl: TWinControl; const AWidth, AHeight: Integer); virtual;
     class procedure SetText(const AWinControl: TWinControl; const AText: String); virtual;
 
+    { TODO: this procedure is only used in win32 interface }
+    class procedure AdaptBounds(const AWinControl: TWinControl;
+          var Left, Top, Width, Height: integer; var SuppressMove: boolean); virtual;
     class procedure ConstraintsChange(const AWinControl: TWinControl); virtual;
     class function  CreateHandle(const AWinControl: TWinControl;
       const AParams: TCreateParams): TLCLIntfHandle; virtual;
@@ -126,6 +129,11 @@ end;
 
 { TWSWinControl }
 
+procedure TWSWinControl.AdaptBounds(const AWinControl: TWinControl;
+  var Left, Top, Width, Height: integer; var SuppressMove: boolean);
+begin
+end;
+
 procedure TWSWinControl.ConstraintsChange(const AWinControl: TWinControl);
 begin
 end;