diff --git a/lcl/interfaces/win32/win32pagecontrol.inc b/lcl/interfaces/win32/win32pagecontrol.inc
index 79724e5253..cc42d3f2da 100644
--- a/lcl/interfaces/win32/win32pagecontrol.inc
+++ b/lcl/interfaces/win32/win32pagecontrol.inc
@@ -146,7 +146,7 @@ begin
   begin
     PageControlHandle := AWinControl.Parent.Handle;
     PageIndex := TCustomPage(AWinControl).PageIndex;
-    RealIndex := TWin32WSCustomNotebook.GetPageRealIndex(TCustomNotebook(AWinControl.Parent), PageIndex);
+    RealIndex := TCustomNotebook(AWinControl.Parent).PageToTabIndex(PageIndex);
     if RealIndex <> -1 then
     begin
       Windows.SendMessage(PageControlHandle, TCM_DELETEITEM, Windows.WPARAM(RealIndex), 0);
@@ -178,7 +178,7 @@ var
   NotebookHandle: HWND;
 begin
   PageIndex := TCustomPage(AWinControl).PageIndex;
-  RealIndex := TWin32WSCustomNotebook.GetPageRealIndex(TCustomNotebook(AWinControl.Parent), PageIndex);
+  RealIndex := TCustomNotebook(AWinControl.Parent).PageToTabIndex(PageIndex);
   NotebookHandle := AWinControl.Parent.Handle;
   // We can't set label of a page not yet added,
   // Check for valid page index
@@ -216,7 +216,7 @@ var
   NotebookHandle: HWND;
 begin
   PageIndex := ACustomPage.PageIndex;
-  RealIndex := TWin32WSCustomNotebook.GetPageRealIndex(TCustomNotebook(ACustomPage.Parent), PageIndex);
+  RealIndex := TCustomNotebook(ACustomPage.Parent).PageToTabIndex(PageIndex);
   NotebookHandle := ACustomPage.Parent.Handle;
   // Check for valid page index
   if (RealIndex >= 0) and (RealIndex < Windows.SendMessage(NotebookHandle, TCM_GETITEMCOUNT,0,0)) then
@@ -550,7 +550,7 @@ begin
   // get the current top window
   OldPageHandle := GetTopWindow(NotebookHandle);
   NewPageHandle := 0;
-  NewRealIndex := GetPageRealIndex(ANotebook, AIndex);
+  NewRealIndex := ANotebook.PageToTabIndex(AIndex);
 
   SendMessage(NotebookHandle, TCM_SETCURSEL, Windows.WParam(NewRealIndex), 0);
 
diff --git a/lcl/interfaces/wince/wincepagecontrol.inc b/lcl/interfaces/wince/wincepagecontrol.inc
index 2f43c21418..ebe5c7f5af 100644
--- a/lcl/interfaces/wince/wincepagecontrol.inc
+++ b/lcl/interfaces/wince/wincepagecontrol.inc
@@ -146,7 +146,7 @@ begin
   begin
     PageControlHandle := AWinControl.Parent.Handle;
     PageIndex := TCustomPage(AWinControl).PageIndex;
-    RealIndex := TWinCEWSCustomNotebook.GetPageRealIndex(TCustomNotebook(AWinControl.Parent), PageIndex);
+    RealIndex := TCustomNotebook(AWinControl.Parent).PageToTabIndex(PageIndex);
     if RealIndex <> -1 then
       Windows.SendMessage(PageControlHandle, TCM_DELETEITEM,
         Windows.WPARAM(RealIndex), 0);
@@ -161,7 +161,7 @@ var
   NotebookHandle: HWND;
 begin
   PageIndex := TCustomPage(AWinControl).PageIndex;
-  RealIndex := TWinCEWSCustomNotebook.GetPageRealIndex(TCustomNotebook(AWinControl.Parent), PageIndex);
+  RealIndex := TCustomNotebook(AWinControl.Parent).PageToTabIndex(PageIndex);
   NotebookHandle := AWinControl.Parent.Handle;
   // We can't set label of a page not yet added,
   // Check for valid page index
@@ -192,7 +192,7 @@ var
   NotebookHandle: HWND;
 begin
   PageIndex := ACustomPage.PageIndex;
-  RealIndex := TWinCEWSCustomNotebook.GetPageRealIndex(TCustomNotebook(ACustomPage.Parent), PageIndex);
+  RealIndex := TCustomNotebook(ACustomPage.Parent).PageToTabIndex(PageIndex);
   NotebookHandle := ACustomPage.Parent.Handle;
   // Check for valid page index
   if (RealIndex >= 0) and (RealIndex < Windows.SendMessage(NotebookHandle, TCM_GETITEMCOUNT,0,0)) then
@@ -459,7 +459,7 @@ begin
   Handle := ANotebook.Handle;
   OldRealIndex := SendMessage(Handle, TCM_GETCURSEL, 0, 0);
   OldIndex := NotebookPageRealToLCLIndex(ANotebook, OldRealIndex);
-  NewRealIndex := GetPageRealIndex(ANotebook, AIndex);
+  NewRealIndex := ANotebook.PageToTabIndex(AIndex);
   SendMessage(Handle, TCM_SETCURSEL, Windows.WParam(NewRealIndex), 0);
   if not (csDestroying in ANotebook.ComponentState) then
   begin
diff --git a/lcl/widgetset/wscomctrls.pp b/lcl/widgetset/wscomctrls.pp
index 54e04eb73b..8fce7def7c 100644
--- a/lcl/widgetset/wscomctrls.pp
+++ b/lcl/widgetset/wscomctrls.pp
@@ -68,7 +68,6 @@ type
 
     class function GetNotebookMinTabHeight(const AWinControl: TWinControl): integer; virtual;
     class function GetNotebookMinTabWidth(const AWinControl: TWinControl): integer; virtual;
-    class function GetPageRealIndex(const ANotebook: TCustomNotebook; AIndex: Integer): Integer; //virtual;
     class function GetTabIndexAtPos(const ANotebook: TCustomNotebook; const AClientPos: TPoint): integer; virtual;
     class function GetTabRect(const ANotebook: TCustomNotebook; const AIndex: Integer): TRect; virtual;
     class function GetCapabilities: TNoteBookCapabilities; virtual;
@@ -339,16 +338,6 @@ begin
   Result:=60;
 end;
 
-class function TWSCustomNotebook.GetPageRealIndex(const ANotebook: TCustomNotebook;
-  AIndex: Integer): Integer;
-begin
-(* Get the Tab index from Page index.
-  No need to override, everything handled in the notebook.
-*)
-  //Result := AIndex;
-  Result := ANotebook.PageToTabIndex(AIndex);
-end;
-
 class function TWSCustomNotebook.GetTabIndexAtPos(const ANotebook: TCustomNotebook;
   const AClientPos: TPoint): integer;
 begin