diff --git a/lcl/interfaces/gtk/gtkwsarrow.pp b/lcl/interfaces/gtk/gtkwsarrow.pp
index 0f767ad478..00b9bb8128 100644
--- a/lcl/interfaces/gtk/gtkwsarrow.pp
+++ b/lcl/interfaces/gtk/gtkwsarrow.pp
@@ -101,6 +101,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, EventBox);
   SetCallBacks(EventBox, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsbuttons.pp b/lcl/interfaces/gtk/gtkwsbuttons.pp
index 0c5fa5cadd..6efca8722b 100644
--- a/lcl/interfaces/gtk/gtkwsbuttons.pp
+++ b/lcl/interfaces/gtk/gtkwsbuttons.pp
@@ -171,6 +171,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, PGtkWidget(Result));
   SetCallbacks(PGtkWidget(Result), WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwscalendar.pp b/lcl/interfaces/gtk/gtkwscalendar.pp
index 995a1c40fc..f39a1db6b1 100644
--- a/lcl/interfaces/gtk/gtkwscalendar.pp
+++ b/lcl/interfaces/gtk/gtkwscalendar.pp
@@ -103,6 +103,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, FrameWidget);
   SetCallBacks(FrameWidget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsclistbox.pp b/lcl/interfaces/gtk/gtkwsclistbox.pp
index d2538c7b08..a5295a18a2 100644
--- a/lcl/interfaces/gtk/gtkwsclistbox.pp
+++ b/lcl/interfaces/gtk/gtkwsclistbox.pp
@@ -96,6 +96,8 @@ begin
   WidgetInfo^.CoreWidget := CList;
   TGtkWidgetSet(WidgetSet).SetSelectionMode(AWinControl, Widget,
     CListBox.MultiSelect, CListBox.ExtendedSelect);
+
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 {$ENDIF}
diff --git a/lcl/interfaces/gtk/gtkwscomctrls.pp b/lcl/interfaces/gtk/gtkwscomctrls.pp
index 83f02e6bb0..2a3ba60ba8 100644
--- a/lcl/interfaces/gtk/gtkwscomctrls.pp
+++ b/lcl/interfaces/gtk/gtkwscomctrls.pp
@@ -267,6 +267,7 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -398,6 +399,7 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -475,6 +477,7 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwscontrols.pp b/lcl/interfaces/gtk/gtkwscontrols.pp
index 85ea569efb..f7b19deb27 100644
--- a/lcl/interfaces/gtk/gtkwscontrols.pp
+++ b/lcl/interfaces/gtk/gtkwscontrols.pp
@@ -857,6 +857,7 @@ begin
   Allocation.Width := AParams.Width;
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(Widget, @Allocation);
+  Set_RC_Name(AWinControl, Widget);
 
   // SetCallbacks isn't called here, it should be done in the 'derived' class
 end;
@@ -905,8 +906,6 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
 
-  Set_RC_Name(AWinControl, Widget);
-  
   Result := THandle(PtrUInt(Widget));
   if Result = 0 then Exit;
 
@@ -922,6 +921,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(Widget, @Allocation);
   
+  Set_RC_Name(AWinControl, Widget);
   SetCCCallbacks(Widget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwscustomlistview.inc b/lcl/interfaces/gtk/gtkwscustomlistview.inc
index 8d9591e8e9..ed56889490 100644
--- a/lcl/interfaces/gtk/gtkwscustomlistview.inc
+++ b/lcl/interfaces/gtk/gtkwscustomlistview.inc
@@ -934,6 +934,7 @@ begin
   // set allocation
   // already created in TGtkWSBaseScrollingWinControl
 
+  Set_RC_Name(AWinControl, PGtkWidget(ScrollWidget));
   SetCallbacks(PGtkWidget(ScrollWidget), PGtkWidget(CListWidget), WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsextctrls.pp b/lcl/interfaces/gtk/gtkwsextctrls.pp
index 157e611ac2..ae95688cf1 100644
--- a/lcl/interfaces/gtk/gtkwsextctrls.pp
+++ b/lcl/interfaces/gtk/gtkwsextctrls.pp
@@ -272,6 +272,7 @@ begin
   WidgetInfo^.ExStyle := AParams.ExStyle;
   WidgetInfo^.WndProc := PtrUInt(AParams.WindowClass.lpfnWndProc);
   
+  Set_RC_Name(AWinControl, Widget);
   SetCallBacks(Widget, WidgetInfo);
 end;
 
@@ -314,6 +315,7 @@ begin
 
   gtk_notebook_set_tab_pos(AWidget, GtkPositionTypeMap[TCustomNotebook(AWinControl).TabPosition]);
   Result := TLCLIntfHandle(PtrUInt(AWidget));
+  Set_RC_Name(AWinControl, PGtkWidget(AWidget));
   SetCallBacks(PGtkWidget(AWidget), WidgetInfo);
 end;
 
@@ -578,6 +580,7 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
   Result := TLCLIntfHandle(PtrUInt(Widget));
+  Set_RC_Name(AWinControl, Widget);
   SetCallBacks(Widget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsforms.pp b/lcl/interfaces/gtk/gtkwsforms.pp
index a4776be667..59cba6e049 100644
--- a/lcl/interfaces/gtk/gtkwsforms.pp
+++ b/lcl/interfaces/gtk/gtkwsforms.pp
@@ -183,6 +183,7 @@ begin
   SetMainWidget(Frame, Layout);
   
   Result := TLCLIntfHandle(PtrUInt(Frame));
+  Set_RC_Name(AWinControl, PGtkWidget(Frame));
   SetCallBacks(PGtkWidget(Frame), WidgetInfo);
 end;
 
@@ -370,6 +371,7 @@ begin
   DebugGtkWidgets.MarkCreated(P, dbgsName(AWinControl));
   {$ENDIF}
   Result := TLCLIntfHandle(PtrUInt(P));
+  Set_RC_Name(AWinControl, P);
   SetCallbacks(P, WidgetInfo);
 end;
 
@@ -509,6 +511,7 @@ begin
   DebugGtkWidgets.MarkCreated(P,dbgsName(AWinControl));
   {$ENDIF}
   Result := TLCLIntfHandle(PtrUInt(P));
+  Set_RC_Name(AWinControl, P);
   SetCallbacks(P, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwspairsplitter.pp b/lcl/interfaces/gtk/gtkwspairsplitter.pp
index 964504a65a..92de30bff0 100644
--- a/lcl/interfaces/gtk/gtkwspairsplitter.pp
+++ b/lcl/interfaces/gtk/gtkwspairsplitter.pp
@@ -103,6 +103,7 @@ begin
 
   WidgetInfo := CreateWidgetInfo(Widget, AWinControl, AParams);
 
+  Set_RC_Name(AWinControl, Widget);
   SetCallBacks(Widget, WidgetInfo);
 end;
 
@@ -176,6 +177,7 @@ begin
   WidgetInfo^.ExStyle := AParams.ExStyle;
   WidgetInfo^.WndProc := PtrUInt(AParams.WindowClass.lpfnWndProc);
 
+  Set_RC_Name(AWinControl, Widget);
   SetCallBacks(Widget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsspin.pp b/lcl/interfaces/gtk/gtkwsspin.pp
index 744291cc75..1bf0abac76 100644
--- a/lcl/interfaces/gtk/gtkwsspin.pp
+++ b/lcl/interfaces/gtk/gtkwsspin.pp
@@ -181,6 +181,7 @@ begin
   {$ENDIF}
   Result := TLCLIntfHandle(PtrUInt(Widget));
   WidgetInfo := CreateWidgetInfo(Widget, AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk/gtkwsstdctrls.pp b/lcl/interfaces/gtk/gtkwsstdctrls.pp
index ee632ac9dc..25bc6eae75 100644
--- a/lcl/interfaces/gtk/gtkwsstdctrls.pp
+++ b/lcl/interfaces/gtk/gtkwsstdctrls.pp
@@ -418,6 +418,7 @@ begin
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -481,6 +482,7 @@ begin
   {$IFDEF DebugLCLComponents}
   DebugGtkWidgets.MarkCreated(Widget, dbgsName(AWinControl));
   {$ENDIF}
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -928,8 +930,9 @@ begin
   Allocation.Y := AParams.Y;
   Allocation.Width := AParams.Width;
   Allocation.Height := AParams.Height;
-  gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
+  gtk_widget_size_allocate(Widget, @Allocation);
 
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -1126,6 +1129,7 @@ begin
   if Result = 0 then
     Exit;
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
+  Set_RC_Name(AWinControl, Widget);
   SetCallbacks(Widget, WidgetInfo);
 end;
 
@@ -1301,6 +1305,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, PGtkWidget(Result));
   SetCallbacks(PGtkWidget(Result), WidgetInfo);
 end;
 
@@ -1443,6 +1448,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, PGtkWidget(Result));
   SetCallbacks(PGtkWidget(Result), WidgetInfo);
 end;
 
@@ -1581,6 +1587,7 @@ begin
   Allocation.Height := AParams.Height;
   gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
 
+  Set_RC_Name(AWinControl, PGtkWidget(Result));
   SetCallbacks(PGtkWidget(Result), WidgetInfo);
 end;
 
@@ -1711,6 +1718,7 @@ begin
   {$ENDIF}
   Result := TLCLIntfHandle(PtrUInt(P));
   //DebugLn(['TGtkWSCustomMemo.CreateHandle ']);
+  Set_RC_Name(AWinControl, P);
   SetCallbacks(P, WidgetInfo);
 end;
 
@@ -1911,9 +1919,10 @@ begin
   Allocation.Y := AParams.Y;
   Allocation.Width := AParams.Width;
   Allocation.Height := AParams.Height;
-  gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
+  gtk_widget_size_allocate(P, @Allocation);
 
-  SetCallbacks(PGtkWidget(Result), WidgetInfo);
+  Set_RC_Name(AWinControl, P);
+  SetCallbacks(P, WidgetInfo);
 end;
 
 class procedure TGtkWSCustomGroupBox.GetPreferredSize(const AWinControl: TWinControl;
@@ -1995,9 +2004,10 @@ begin
   Allocation.Y := AParams.Y;
   Allocation.Width := AParams.Width;
   Allocation.Height := AParams.Height;
-  gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
+  gtk_widget_size_allocate(Widget, @Allocation);
 
-  TGtkWSCustomCheckBox.SetCallbacks(PGtkWidget(Result), WidgetInfo);
+  Set_RC_Name(AWinControl, Widget);
+  TGtkWSCustomCheckBox.SetCallbacks(Widget, WidgetInfo);
 end;
 
 { TGtkWSToggleBox }
@@ -2020,9 +2030,10 @@ begin
   Allocation.Y := AParams.Y;
   Allocation.Width := AParams.Width;
   Allocation.Height := AParams.Height;
-  gtk_widget_size_allocate(PGtkWidget(Result), @Allocation);
+  gtk_widget_size_allocate(Widget, @Allocation);
 
-  TGtkWSCustomCheckBox.SetCallbacks(PGtkWidget(Result), WidgetInfo);
+  Set_RC_Name(AWinControl, Widget);
+  TGtkWSCustomCheckBox.SetCallbacks(Widget, WidgetInfo);
 end;
 
 initialization
diff --git a/lcl/interfaces/gtk2/gtk2wschecklst.pp b/lcl/interfaces/gtk2/gtk2wschecklst.pp
index 4fe8ec0584..912b1c06ab 100644
--- a/lcl/interfaces/gtk2/gtk2wschecklst.pp
+++ b/lcl/interfaces/gtk2/gtk2wschecklst.pp
@@ -187,6 +187,8 @@ begin
     True : gtk_tree_selection_set_mode(Selection, GTK_SELECTION_MULTIPLE);
     False: gtk_tree_selection_set_mode(Selection, GTK_SELECTION_SINGLE);
   end;
+
+  Set_RC_Name(AWinControl, P);  
   SetCallbacks(p, WidgetInfo);
 end;
 
diff --git a/lcl/interfaces/gtk2/gtk2wscustommemo.inc b/lcl/interfaces/gtk2/gtk2wscustommemo.inc
index 1d9efb0796..b508f6db1a 100644
--- a/lcl/interfaces/gtk2/gtk2wscustommemo.inc
+++ b/lcl/interfaces/gtk2/gtk2wscustommemo.inc
@@ -133,6 +133,7 @@ begin
   
   gtk_widget_show_all(Widget);
 
+  Set_RC_Name(AWinControl, Widget);  
   SetCallbacks(Widget, WidgetInfo);
 end;