* Dotted filenames for package gtk2

packages/gtk2/namespaced/Api.Atk.pas

@@ -0,0 +1,3 @@
+unit Api.Atk;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i atk.pas}

packages/gtk2/namespaced/Api.Gdk2.pas

@@ -0,0 +1,3 @@
+unit Api.Gdk2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gdk2.pas}

packages/gtk2/namespaced/Api.Glade2.pas

@@ -0,0 +1,3 @@
+unit Api.Glade2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i libglade2.pas}

packages/gtk2/namespaced/Api.Glib2.pas

@@ -0,0 +1,3 @@
+unit Api.Glib2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i glib2.pas}

packages/gtk2/namespaced/Api.Gtk2.Buildgtk2.pp

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Buildgtk2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i buildgtk2.pp}

packages/gtk2/namespaced/Api.Gtk2.Gdk2pixbuf.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gdk2pixbuf;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gdk2pixbuf.pas}

packages/gtk2/namespaced/Api.Gtk2.Gdk2x.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gdk2x;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gdk2x.pas}

packages/gtk2/namespaced/Api.Gtk2.Gdkglext.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gdkglext;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gdkglext.pas}

packages/gtk2/namespaced/Api.Gtk2.Gtk2.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gtk2;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gtk2.pas}

packages/gtk2/namespaced/Api.Gtk2.Gtk2ext.pp

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gtk2ext;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gtk2ext.pp}

packages/gtk2/namespaced/Api.Gtk2.Gtkglext.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gtkglext;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gtkglext.pas}

packages/gtk2/namespaced/Api.Gtk2.Gtkhtml.pas

@@ -0,0 +1,3 @@
+unit Api.Gtk2.Gtkhtml;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gtkhtml.pas}

packages/gtk2/namespaced/Api.Pango.pas

@@ -0,0 +1,3 @@
+unit Api.Pango;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pango.pas}

packages/gtk2/namespaced/Api.Pangocairo.pas

@@ -0,0 +1,3 @@
+unit Api.Pangocairo;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pangocairo.pas}

packages/gtk2/namespaced/Api.Pangoutils.pas

@@ -0,0 +1,3 @@
+unit Api.Pangoutils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pangoutils.pas}

packages/gtk2/namespaces.lst

@@ -0,0 +1,41 @@
+src/gtk+/gdk-pixbuf/gdk2pixbuf.pas=namespaced/Api.Gtk2.Gdk2pixbuf.pas
+{s*:src/gtk+/gdk-pixbuf/}=namespaced/
+{i+:src/gtk+/gdk-pixbuf/}
+src/gtk+/gtk/gtk2.pas=namespaced/Api.Gtk2.Gtk2.pas
+{s*:src/gtk+/gtk/}=namespaced/
+{i+:src/gtk+/gtk/}
+src/gtk+/gdk/gdk2.pas=namespaced/Api.Gdk2.pas
+{s*:src/gtk+/gdk/}=namespaced/
+{i+:src/gdk/}
+src/libglade/libglade2.pas=namespaced/Api.Glade2.pas
+{s*:src/libglade/}=namespaced/
+{i+:src/libglade/}
+src/pango/pangoutils.pas=namespaced/Api.Pangoutils.pas
+{s*:src/pango/}=namespaced/
+{i+:src/pango/}
+src/pango/pango.pas=namespaced/Api.Pango.pas
+src/atk/atk.pas=namespaced/Api.Atk.pas
+{s*:src/atk/}=namespaced/
+{i+:src/atk/}
+src/pangocairo/pangocairo.pas=namespaced/Api.Pangocairo.pas
+{s*:src/pangocairo/}=namespaced/
+{i+:src/pangocairo/}
+src/gtk2x11/gdk2x.pas=namespaced/Api.Gtk2.Gdk2x.pas
+{s*:src/gtk2x11/}=namespaced/
+{i+:src/gtk2x11/}
+src/gtkext/gtk2ext.pp=namespaced/Api.Gtk2.Gtk2ext.pp
+{s*:src/gtkext/}=namespaced/
+{i+:src/gtkext/}
+src/gtkhtml/gtkhtml.pas=namespaced/Api.Gtk2.Gtkhtml.pas
+{s*:src/gtkhtml/}=namespaced/
+{i+:src/gtkhtml/}
+src/buildgtk2.pp=namespaced/Api.Gtk2.Buildgtk2.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/glib/glib2.pas=namespaced/Api.Glib2.pas
+{s*:src/glib/}=namespaced/
+{i+:src/glib/}
+src/gtkglext/gdkglext.pas=namespaced/Api.Gtk2.Gdkglext.pas
+{s*:src/gtkglext/}=namespaced/
+{i+:src/gtkglext/}
+src/gtkglext/gtkglext.pas=namespaced/Api.Gtk2.Gtkglext.pas

packages/gtk2/src/atk/atk.pas

@@ -16,7 +16,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit atk; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -27,7 +29,11 @@ unit atk; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2;
+{$ELSE FPC_DOTTEDUNITS}
 uses glib2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef windows}

packages/gtk2/src/buildgtk2.pp

@@ -18,18 +18,29 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit buildgtk2; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Gtk2.Gtk2, Api.Glade2,Api.Gtk2.Gdkglext,Api.Gtk2.Gtkglext, Api.Gtk2.Gtk2ext
+{$ifdef Unix}  
+  ,Api.Gtk2.Gdk2x
+{$endif Unix}
+  , Api.Pangocairo;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   gtk2, libglade2,gdkglext,gtkglext, gtk2ext
 {$ifdef unix}  
   ,gdk2x
 {$endif unix}
   , pangocairo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 implementation
 

packages/gtk2/src/glib/glib2.pas

@@ -23,7 +23,9 @@
    files for a list of changes.  These files are distributed with
    GLib at ftp://ftp.gtk.org/pub/gtk/.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit glib2; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -34,8 +36,13 @@ unit glib2; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes,System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ctypes,SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef windows}
@@ -683,7 +690,7 @@ function GLIB_CHECK_VERSION (major, minor, micro: guint):boolean;
  *}
 procedure g_error    (format:Pgchar; args: array of const);
 begin
-  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, Pgchar(SysUtils.Format(string(format), args)));
+  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, Pgchar({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(string(format), args)));
 end;
 
 procedure g_error    (format:Pgchar);
@@ -693,7 +700,7 @@ end;
 
 procedure g_message  (format:Pgchar; args: array of const);
 begin
-  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, Pgchar(SysUtils.Format(string(format), args)));
+  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, Pgchar({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(string(format), args)));
 end;
 
 procedure g_message  (format:Pgchar);
@@ -703,7 +710,7 @@ end;
 
 procedure g_critical (format:Pgchar; args: array of const);
 begin
-  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, Pgchar(SysUtils.Format(string(format), args)));
+  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, Pgchar({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(string(format), args)));
 end;
 
 procedure g_critical (format:Pgchar);
@@ -713,7 +720,7 @@ end;
 
 procedure g_warning  (format:Pgchar; args: array of const);
 begin
-  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, Pgchar(SysUtils.Format(string(format), args)));
+  g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, Pgchar({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(string(format), args)));
 end;
 
 procedure g_warning  (format:Pgchar);

packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas

@@ -22,7 +22,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gdk2pixbuf; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -33,7 +35,11 @@ unit gdk2pixbuf; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2;
+{$ELSE FPC_DOTTEDUNITS}
 uses glib2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef windows}

packages/gtk2/src/gtk+/gdk/gdk2.pas

@@ -18,7 +18,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
    MA 02110-1301, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gdk2; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -29,7 +31,11 @@ unit gdk2; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2, Api.Gtk2.Gdk2pixbuf, Api.Pango, Api.Cairo.Lib;
+{$ELSE FPC_DOTTEDUNITS}
 uses glib2, gdk2pixbuf, pango, cairo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 // OS dependent defines

packages/gtk2/src/gtk+/gtk/gtk2.pas

@@ -16,7 +16,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gtk2; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 // default GTK2_8
 {$define GTK2_8}
@@ -67,8 +69,13 @@ unit gtk2; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Glib2, Api.Atk, Api.Pango, Api.Gtk2.Gdk2pixbuf, Api.Gdk2;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   glib2, atk, pango, gdk2pixbuf, gdk2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 // OS dependent defines
@@ -138,8 +145,13 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
 { There is a bug in the compiler. If an external variable is not used, it will

packages/gtk2/src/gtk2x11/gdk2x.pas

@@ -13,7 +13,9 @@
   Author: Mattias Gaertner
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gdk2x;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -24,8 +26,13 @@ unit gdk2x;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils, UnixApi.Types, UnixApi.Unix, UnixApi.Base, Api.Glib2, Api.Gdk2, Api.X11.Xlib, Api.X11.X, Api.X11.Xrender;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils, UnixType, Unix, BaseUnix, glib2, gdk2, XLib, X, XRender;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef FREEBSD}
   {$linklib pthread}

packages/gtk2/src/gtkext/gtk2ext.pp

@@ -1,11 +1,18 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gtk2ext;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Glib2, Api.Gdk2, Api.Gtk2.Gdk2pixbuf, Api.Gtk2.Gtk2;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   glib2, gdk2, gdk2pixbuf, gtk2;
+{$ENDIF FPC_DOTTEDUNITS}
   
 const
   { This is equired when people don't have -dev/-devel packages on linux.
@@ -28,8 +35,13 @@ const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   gtkhandle : tlibhandle;

packages/gtk2/src/gtkglext/gdkglext.pas

@@ -24,11 +24,17 @@
 
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gdkglext;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2, Api.Gdk2;
+{$ELSE FPC_DOTTEDUNITS}
 uses Glib2, Gdk2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   GdkGLExtLib = 

packages/gtk2/src/gtkglext/gtkglext.pas

@@ -24,11 +24,17 @@
 
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gtkglext;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2, Api.Gdk2, Api.Gtk2.Gtk2, Api.Gtk2.Gdkglext;
+{$ELSE FPC_DOTTEDUNITS}
 uses Glib2, Gdk2, Gtk2, GdkGLExt;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   GtkGLExtLib = 

packages/gtk2/src/gtkhtml/gtkhtml.pas

@@ -21,7 +21,9 @@
 {
   !!!!! Maybe wrong for kylix !!!!!
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gtkhtml;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$H+}
 {$IFDEF FPC}
@@ -33,8 +35,13 @@ unit gtkhtml;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Gtk2.Gtk2, Api.Glib2, Api.Atk, Api.Pango, Api.Gtk2.Gdk2pixbuf, Api.Gdk2;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   gtk2, glib2, atk, pango, gdk2pixbuf, gdk2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 // OS dependent defines

packages/gtk2/src/libglade/libglade2.pas

@@ -19,7 +19,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit libglade2; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -30,8 +32,13 @@ unit libglade2; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Glib2, Api.Gtk2.Gtk2;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   glib2, gtk2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef windows}

packages/gtk2/src/pango/pango.pas

@@ -19,7 +19,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111-1301, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pango; // keep unit name lowercase for kylix
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -30,7 +32,11 @@ unit pango; // keep unit name lowercase for kylix
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2;
+{$ELSE FPC_DOTTEDUNITS}
 uses glib2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$DEFINE PANGO_ENABLE_ENGINE}
 {$DEFINE PANGO_ENABLE_BACKEND}

packages/gtk2/src/pango/pangoutils.pas

@@ -18,7 +18,9 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
   }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pangoutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$MODE objfpc}
@@ -29,8 +31,13 @@ unit pangoutils;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.Glib2, Api.Pango;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   glib2, pango;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Pointers to basic pascal types, inserted by h2pas conversion program.}
 Type

packages/gtk2/src/pangocairo/pangocairo.pas

@@ -20,7 +20,9 @@
     Boston, MA 02111-1301, USA.
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pangocairo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
   {$mode objfpc}
@@ -30,7 +32,11 @@ unit pangocairo;
 {$ENDIF}
 
 interface
+{$IFDEF FPC_DOTTEDUNITS}
+uses Api.Glib2, Api.Pango, Api.Cairo.Lib;
+{$ELSE FPC_DOTTEDUNITS}
 uses glib2, pango, cairo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifdef windows}