lcl: gtk2: simplified unit dependencies

lcl/interfaces/gtk2/gtk2wscomctrls.pp

@@ -33,7 +33,8 @@ uses
   // GtkWidgetset
   Gtk2Def, Gtk2Globals, Gtk2Proc,
   // Gtk2Widgetset
-  Gtk2WSControls, Gtk2Int;
+  Gtk2WSControls, Gtk2Int, Gtk2Extra, Gtk2CellRenderer
+  {$IFNDEF USEORIGTREEMODEL}, Gtk2ListViewTreeModel{$ENDIF};
 
 const
   TVItemCachePart = 1000;
@@ -294,8 +295,6 @@ type
 
 implementation
 
-uses Gtk2CellRenderer, Gtk2Extra{$IFNDEF USEORIGTREEMODEL}, Gtk2ListViewTreeModel{$ENDIF};
-
 {$I gtk2pagecontrol.inc}
 
 // Will be used commonly for ListViews and TreeViews

lcl/interfaces/gtk2/gtk2wscontrols.pp

@@ -38,7 +38,7 @@ uses
 
   Gtk2Globals, Gtk2Def,
   Gtk2Proc,
-  WSControls, WSProc, Gtk2WinapiWindow;
+  WSControls, WSProc, Gtk2WinapiWindow, Gtk2WSPrivate;
   
 
 type
@@ -151,7 +151,7 @@ var
 implementation
 
 uses
-  Gtk2Int, Gtk2WSPrivate;
+  Gtk2Int;
 
 { TGtk2WSWinControl }
 

lcl/interfaces/gtk2/gtk2wsfactory.pas

@@ -10,7 +10,25 @@ uses
   // LCL
   Controls, ComCtrls, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, ExtDlgs, Buttons, CheckLst, Forms, Grids, Menus,
-  PairSplitter, WSLCLClasses, WSDialogs;
+  PairSplitter, WSLCLClasses, WSDialogs,
+  // gtk widgetset
+  Gtk2WSButtons,
+  Gtk2WSCalendar,
+  Gtk2WSCheckLst,
+  Gtk2WSComCtrls,
+  Gtk2WSControls,
+  Gtk2WSDialogs,
+  Gtk2WSExtCtrls,
+  Gtk2WSExtDlgs,
+  Gtk2WSForms,
+  Gtk2WSGrids,
+  {%H-}Gtk2WSImgList,
+  Gtk2WSMenus,
+  Gtk2WSSpin,
+  Gtk2WSStdCtrls,
+  Gtk2WSPairSplitter,
+  Gtk2WSPrivate,
+  UnityWSCtrls;
 
 
 // imglist
@@ -108,25 +126,6 @@ function RegisterLazDeviceAPIs: Boolean;
 
 implementation
 
-uses
-  Gtk2WSButtons,
-  Gtk2WSCalendar,
-  Gtk2WSCheckLst,
-  Gtk2WSComCtrls,
-  Gtk2WSControls,
-  Gtk2WSDialogs,
-  Gtk2WSExtCtrls,
-  Gtk2WSExtDlgs,
-  Gtk2WSForms,
-  Gtk2WSGrids,
-  {%H-}Gtk2WSImgList,
-  Gtk2WSMenus,
-  Gtk2WSSpin,
-  Gtk2WSStdCtrls,
-  Gtk2WSPairSplitter,
-  Gtk2WSPrivate,
-  UnityWSCtrls;
-
 // imglist
 function RegisterCustomImageListResolution: Boolean; alias : 'WSRegisterCustomImageListResolution';
 begin

lcl/interfaces/gtk2/gtk2wsprivate.pp

@@ -18,8 +18,8 @@
   for details about the license.
  *****************************************************************************
 }
-
 unit Gtk2WSPrivate;
+
 {$mode objfpc}{$H+}
 
 interface
@@ -33,7 +33,7 @@ uses
   // widgetset
   WSControls, WSLCLClasses, WSProc,
   // interface
-  Gtk2Def, Gtk2Proc, Gtk2WSControls;
+  Gtk2Extra, Gtk2Def, Gtk2Proc;
 
 
 type
@@ -270,8 +270,7 @@ procedure SetGlobalCursor(Cursor: HCURSOR);
 
 implementation
 
-uses
-  Gtk2Extra;
+uses Gtk2WSControls;
 
 {$I Gtk2PrivateWidget.inc}
 {$I Gtk2PrivateList.inc}