From 0c15e751c58253c6a02579d3de1af8d3ceed13c7 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 25 Dec 2003 14:34:16 +0000
Subject: [PATCH] renamed gtkglarea.pp to gtkglarecontrol.pas

git-svn-id: trunk@4952 -
---
 .gitattributes                                |   2 +-
 components/gtk/gtkglarea/Makefile             | 150 ++++++++++++++++--
 components/gtk/gtkglarea/Makefile.fpc         |   4 +-
 .../{gtkglarea.pp => gtkglareacontrol.pas}    |   2 +-
 components/gtk/gtkglarea/gtkopengl.lpk        |  14 +-
 components/gtk/gtkglarea/gtkopengl.pas        |   4 +-
 components/gtk/gtkglarea/nvglx.pp             |   5 -
 7 files changed, 149 insertions(+), 32 deletions(-)
 rename components/gtk/gtkglarea/{gtkglarea.pp => gtkglareacontrol.pas} (99%)

diff --git a/.gitattributes b/.gitattributes
index 82e6548be5..79f55f8434 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -47,8 +47,8 @@ components/codetools/sourcechanger.pas svneol=native#text/pascal
 components/codetools/sourcelog.pas svneol=native#text/pascal
 components/codetools/stdcodetools.pas svneol=native#text/pascal
 components/gtk/gtkglarea/gtkglarea.lrs svneol=native#text/pascal
-components/gtk/gtkglarea/gtkglarea.pp svneol=native#text/pascal
 components/gtk/gtkglarea/gtkglarea_int.pp svneol=native#text/pascal
+components/gtk/gtkglarea/gtkglareacontrol.pas svneol=native#text/pascal
 components/gtk/gtkglarea/gtkopengl.lpk svneol=native#text/pascal
 components/gtk/gtkglarea/gtkopengl.pas svneol=native#text/pascal
 components/gtk/gtkglarea/nvgl.pp svneol=native#text/pascal
diff --git a/components/gtk/gtkglarea/Makefile b/components/gtk/gtkglarea/Makefile
index dba341d36c..ce32548f08 100644
--- a/components/gtk/gtkglarea/Makefile
+++ b/components/gtk/gtkglarea/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/12/21]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -205,7 +206,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=gtkopengl
 override PACKAGE_VERSION=1.0
 override TARGET_UNITS+=gtkglarea
-override TARGET_IMPLICITUNITS+=gtkglarea_int nvgl gtkglarea
+override TARGET_IMPLICITUNITS+=gtkglarea_int nvgl gtkglareacontrol
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 override DIST_ZIPNAME=lazarus.gtkglarea.$(ZIPSUFFIX)
 override COMPILER_OPTIONS+=-gl -k-lGL
@@ -292,9 +293,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -403,16 +412,16 @@ endif
 else
 CROSSBINDIR=
 endif
-ifdef inUnix
+ifeq ($(OS_SOURCE),linux)
 ifndef GCCLIBDIR
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
-ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
-ifeq ($(OS_TARGET),netbsd)
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR+=/usr/pkg/lib
 endif
 export GCCLIBDIR OTHERLIB
@@ -440,6 +449,14 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.wat
+ZIPSUFFIX=watc
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -542,6 +559,11 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.dos
+ZIPSUFFIX=watcom
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -730,7 +752,11 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@@ -801,14 +827,16 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),win32)
 ASNAME=as
 LDNAME=ld
 ARNAME=ar
-RCNAME=rc
-ifeq ($(OS_TARGET),win32)
-ASNAME=asw
-LDNAME=ldw
-ARNAME=arw
+endif
 endif
 ifndef ASPROG
 ifdef CROSSBINDIR
@@ -888,12 +916,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -902,12 +932,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -916,12 +948,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -930,12 +964,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -944,12 +980,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),go32v2)
@@ -973,6 +1011,7 @@ REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 endif
@@ -993,12 +1032,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),freebsd)
@@ -1007,12 +1048,14 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),beos)
@@ -1038,6 +1081,7 @@ REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),netbsd)
@@ -1052,6 +1096,7 @@ REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -1132,6 +1177,7 @@ REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),openbsd)
@@ -1146,6 +1192,7 @@ REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 endif
 endif
 ifeq ($(OS_TARGET),wdosx)
@@ -1203,6 +1250,17 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
 endif
+ifeq ($(OS_TARGET),watcom)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+REQUIRE_PACKAGES_NETDB=1
+REQUIRE_PACKAGES_LIBASYNC=1
+endif
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1307,6 +1365,32 @@ ifdef UNITDIR_LIBASYNC
 override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
 endif
 endif
+ifdef REQUIRE_PACKAGES_PTHREADS
+PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PTHREADS),)
+ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),)
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET)
+else
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PTHREADS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PTHREADS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PTHREADS=
+UNITDIR_PTHREADS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PTHREADS),)
+UNITDIR_PTHREADS:=$(firstword $(UNITDIR_PTHREADS))
+else
+UNITDIR_PTHREADS=
+endif
+endif
+ifdef UNITDIR_PTHREADS
+override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS)
+endif
+endif
 ifdef REQUIRE_PACKAGES_FCL
 PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_FCL),)
@@ -1463,6 +1547,32 @@ ifdef UNITDIR_IBASE
 override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
 endif
 endif
+ifdef REQUIRE_PACKAGES_SQLITE
+PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_SQLITE),)
+ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/$(OS_TARGET)),)
+UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/$(OS_TARGET)
+else
+UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_SQLITE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_SQLITE=
+UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_SQLITE),)
+UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE))
+else
+UNITDIR_SQLITE=
+endif
+endif
+ifdef UNITDIR_SQLITE
+override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
+endif
+endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(CPU_TARGET)
 endif
@@ -1472,6 +1582,14 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1609,7 +1727,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1622,10 +1740,14 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
+%$(EXEEXT): %.dpr
+	$(COMPILER) $<
+	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
@@ -1943,4 +2065,4 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .PHONY: cleartarget all makefile makefiles
-all: cleartarget gtkglarea$(PPUEXT)
+all: cleartarget gtkglareacontrol$(PPUEXT)
diff --git a/components/gtk/gtkglarea/Makefile.fpc b/components/gtk/gtkglarea/Makefile.fpc
index 5080f48860..eea9a5fc3f 100644
--- a/components/gtk/gtkglarea/Makefile.fpc
+++ b/components/gtk/gtkglarea/Makefile.fpc
@@ -13,7 +13,7 @@ unitdir=. ../../../lcl/units ../../../lcl/units/gtk
 
 [target]
 units=gtkglarea
-implicitunits=gtkglarea_int nvgl gtkglarea
+implicitunits=gtkglarea_int nvgl gtkglareacontrol
 
 [default]
 
@@ -31,6 +31,6 @@ zipname=lazarus.gtkglarea.$(ZIPSUFFIX)
 [rules]
 .PHONY: cleartarget all makefile makefiles
 
-all: cleartarget gtkglarea$(PPUEXT)
+all: cleartarget gtkglareacontrol$(PPUEXT)
 
 # end.
diff --git a/components/gtk/gtkglarea/gtkglarea.pp b/components/gtk/gtkglarea/gtkglareacontrol.pas
similarity index 99%
rename from components/gtk/gtkglarea/gtkglarea.pp
rename to components/gtk/gtkglarea/gtkglareacontrol.pas
index 2c8bf7ed41..ffa9bf3876 100644
--- a/components/gtk/gtkglarea/gtkglarea.pp
+++ b/components/gtk/gtkglarea/gtkglareacontrol.pas
@@ -13,7 +13,7 @@
   Author: Mattias Gaertner
 
 }
-unit GTKGLArea;
+unit GTKGLAreaControl;
 
 {$MODE objfpc}{$H+}
 
diff --git a/components/gtk/gtkglarea/gtkopengl.lpk b/components/gtk/gtkglarea/gtkopengl.lpk
index 026629ee78..bd1578766d 100644
--- a/components/gtk/gtkglarea/gtkopengl.lpk
+++ b/components/gtk/gtkglarea/gtkopengl.lpk
@@ -18,17 +18,17 @@ Please make sure that you link to the right libgtkgl. If you accidently link to
     <Version Major="1"/>
     <Files Count="5">
       <Item1>
-        <Filename Value="gtkglarea.pp"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="GTKGLArea"/>
-      </Item1>
-      <Item2>
         <Filename Value="gtkglarea.lrs"/>
         <Type Value="LRS"/>
-      </Item2>
-      <Item3>
+      </Item1>
+      <Item2>
         <Filename Value="gtkglarea_int.pp"/>
         <UnitName Value="GTKGLArea_Int"/>
+      </Item2>
+      <Item3>
+        <Filename Value="gtkglareacontrol.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="GTKGLAreaControl"/>
       </Item3>
       <Item4>
         <Filename Value="nvgl.pp"/>
diff --git a/components/gtk/gtkglarea/gtkopengl.pas b/components/gtk/gtkglarea/gtkopengl.pas
index 3264eccd59..5aa3d870d8 100644
--- a/components/gtk/gtkglarea/gtkopengl.pas
+++ b/components/gtk/gtkglarea/gtkopengl.pas
@@ -8,13 +8,13 @@ unit GTKOpenGL;
 interface
 
 uses
-  GTKGLArea, GTKGLArea_Int, nvGL, nvGLX, LazarusPackageIntf; 
+  GTKGLArea_Int, GTKGLAreaControl, nvGL, nvGLX, LazarusPackageIntf; 
 
 implementation
 
 procedure Register; 
 begin
-  RegisterUnit('GTKGLArea', @GTKGLArea.Register); 
+  RegisterUnit('GTKGLAreaControl', @GTKGLAreaControl.Register); 
 end; 
 
 initialization
diff --git a/components/gtk/gtkglarea/nvglx.pp b/components/gtk/gtkglarea/nvglx.pp
index 8160016a33..a359595e4d 100644
--- a/components/gtk/gtkglarea/nvglx.pp
+++ b/components/gtk/gtkglarea/nvglx.pp
@@ -254,9 +254,6 @@ const
 { GLX resources. }
 
 type
-
-  TXID = cardinal;
-
   PGLXContextID = ^GLXContextID;
   GLXContextID = TXID;
 
@@ -288,8 +285,6 @@ type
   PGLXFBConfigSGIX = ^TGLXFBConfigSGIX;
   TGLXFBConfigSGIX = pointer;
 
-  PCardinal = ^Cardinal;
-
 { GLX 1.0 functions. }
 
 function glXChooseVisual(dpy:PDisplay; screen:longint; attrib_list:Plongint):PXVisualInfo;cdecl;external;