diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi
index f6e792a..55197e4 100644
--- a/Client/CentrED.lpi
+++ b/Client/CentrED.lpi
@@ -11,21 +11,16 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -369,6 +364,7 @@
+
diff --git a/Client/CentrED.lpr b/Client/CentrED.lpr
index 638b39b..2d0f18a 100644
--- a/Client/CentrED.lpr
+++ b/Client/CentrED.lpr
@@ -1,52 +1,51 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Portions Copyright 2009 Andreas Schneider
- *)
-program CentrED;
-
-{$mode objfpc}{$H+}
-
-uses
- {$IFDEF UNIX}{$IFDEF UseCThreads}
- cthreads,
- {$ENDIF}{$ENDIF}
- SysUtils,
- Interfaces, // this includes the LCL widgetset
- Forms, LResources, UdmNetwork;
-
-{$IFDEF WINDOWS}{$R CentrED.rc}{$ENDIF}
-
-function GetApplicationName: String;
-begin
- Result := 'CentrED';
-end;
-
-begin
- {$I CentrED.lrs}
- OnGetApplicationName := @GetApplicationName;
- Application.Initialize;
- Application.CreateForm(TdmNetwork, dmNetwork);
- Application.Run;
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Portions Copyright 2010 Andreas Schneider
+ *)
+program CentrED;
+
+{$mode objfpc}{$H+}
+
+uses
+ {$IFDEF UNIX}{$IFDEF UseCThreads}
+ cthreads,
+ {$ENDIF}{$ENDIF}
+ SysUtils,
+ Interfaces, // this includes the LCL widgetset
+ Forms, UdmNetwork;
+
+{$R CentrED.res}
+
+function GetApplicationName: String;
+begin
+ Result := 'CentrED';
+end;
+
+begin
+ OnGetApplicationName := @GetApplicationName;
+ Application.Initialize;
+ Application.CreateForm(TdmNetwork, dmNetwork);
+ Application.Run;
+end.
+
diff --git a/Client/UPlatformTypes.pas b/Client/UPlatformTypes.pas
index 4ec55c9..7c386a4 100644
--- a/Client/UPlatformTypes.pas
+++ b/Client/UPlatformTypes.pas
@@ -1,41 +1,42 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Portions Copyright 2007 Andreas Schneider
- *)
-unit UPlatformTypes;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
- Classes, SysUtils, ActiveX;
-
-type
- IDataObject = ActiveX.IDataObject;
-
-implementation
-
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php. If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Portions Copyright 2007 Andreas Schneider
+ *)
+unit UPlatformTypes;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+ Classes, SysUtils,
+ {$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF};
+
+type
+ IDataObject = {$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF}.IDataObject;
+
+implementation
+
+end.
+
diff --git a/Imaging/ImagingComponents.pas b/Imaging/ImagingComponents.pas
index 393ebf5..a9c0252 100644
--- a/Imaging/ImagingComponents.pas
+++ b/Imaging/ImagingComponents.pas
@@ -336,7 +336,7 @@ implementation
uses
{$IF Defined(LCL)}
{$IF Defined(LCLGTK2)}
- GLib2, GDK2, GTK2, GTKDef, GTKProc,
+ GLib2, GDK2, GTK2, GTK2Def, GTK2Proc,
{$ELSEIF Defined(LCLGTK)}
GDK, GTK, GTKDef, GTKProc,
{$IFEND}