FIX: Build with Lazarus trunk

src/frames/foptionstoolseditor.pas

@@ -27,7 +27,7 @@ unit fOptionsToolsEditor;
 interface
 
 uses
-  Classes, SysUtils, StdCtrls, ExtCtrls, Dialogs,
+  Classes, SysUtils, StdCtrls, ExtCtrls, Dialogs, LCLVersion,
   Buttons, EditBtn, Menus, SpinEx, fOptionsFrame, fOptionsToolBase;
 
 type
@@ -63,7 +63,12 @@ implementation
 {$R *.lfm}
 
 uses
-  SynEdit, uGlobs, uLng, fEditor;
+  {$if lcl_fullversion < 2010000}
+  SynEdit
+  {$else}
+  SynEditTypes
+  {$endif}
+  , uGlobs, uLng, fEditor;
 
 { TfrmOptionsEditor }
 

src/platform/win/uwin32widgetsetfix.pas

@@ -4,6 +4,10 @@ unit uWin32WidgetSetFix;
 
 interface
 
+uses
+  LCLVersion;
+
+
 implementation
 
 uses
@@ -112,7 +116,9 @@ begin
 end;
 
 initialization
+{$if lcl_fullversion < 2010000}
   Initialize;
+{$endif}
 
 end.
 

src/uglobs.pas

@@ -43,10 +43,10 @@ interface
 
 uses
   Classes, SysUtils, Controls, Forms, Grids, Types, uExts, uColorExt, Graphics,
-  DCClassesUtf8, uMultiArc, uColumns, uHotkeyManager, uSearchTemplate,
+  LCLVersion, DCClassesUtf8, uMultiArc, uColumns, uHotkeyManager, uSearchTemplate,
   uFileSourceOperationOptions, uWFXModule, uWCXModule, uWDXModule, uwlxmodule,
   udsxmodule, DCXmlConfig, uInfoToolTip, fQuickSearch, uTypes, uClassesEx,
-  uHotDir, uSpecialDir, SynEdit, uFavoriteTabs, fTreeViewMenu, uConvEncoding;
+  uHotDir, uSpecialDir, SynEdit, SynEditTypes, uFavoriteTabs, fTreeViewMenu, uConvEncoding;
 
 type
   { Configuration options }
@@ -719,6 +719,9 @@ uses
    {$IF DEFINED(MSWINDOWS)}
     , ShlObj
    {$ENDIF}
+   {$if lcl_fullversion >= 2010000}
+   , SynEditMiscClasses
+   {$endif}
    ;
 
 const