--- a/Make.proto	Tue Aug 15 14:54:58 2017 +0100
+++ b/Make.proto	Wed Sep 06 09:47:50 2017 +0200
@@ -60,7 +60,7 @@
 OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
 
 
-LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
+LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
 
 
 all:: preMake classLibRule postMake
@@ -299,7 +299,7 @@
 $(OUTDIR)Image.$(O) Image.$(C) Image.$(H): Image.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ImageReader.$(O) ImageReader.$(C) ImageReader.$(H): ImageReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)KeyboardForwarder.$(O) KeyboardForwarder.$(C) KeyboardForwarder.$(H): KeyboardForwarder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)KeyboardMap.$(O) KeyboardMap.$(C) KeyboardMap.$(H): KeyboardMap.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(STCHDR)
+$(OUTDIR)KeyboardMap.$(O) KeyboardMap.$(C) KeyboardMap.$(H): KeyboardMap.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ResourcePack.$(O) ResourcePack.$(C) ResourcePack.$(H): ResourcePack.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(STCHDR)
 $(OUTDIR)WindowGroup.$(O) WindowGroup.$(C) WindowGroup.$(H): WindowGroup.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(STCHDR)
 $(OUTDIR)WindowSensor.$(O) WindowSensor.$(C) WindowSensor.$(H): WindowSensor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)

--- a/Make.spec	Tue Aug 15 14:54:58 2017 +0100
+++ b/Make.spec	Wed Sep 06 09:47:50 2017 +0200
@@ -60,7 +60,6 @@
 	DeviceHandle \
 	DisplayTransform \
 	Event \
-	FillStyle \
 	FontDescription \
 	GraphicsContext \
 	GraphicsDevice \
@@ -74,7 +73,6 @@
 	WindowSensor \
 	stx_libview \
 	BeveledBorder \
-	BitmapFillStyle \
 	BitmapFont \
 	Border \
 	ColorPalette \
@@ -93,20 +91,14 @@
 	Font \
 	Form \
 	GradientBackground \
-	GradientFillStyle \
 	HostGraphicsDevice \
 	ImageBackground \
 	MacButtonBorder \
 	NoBackground \
-	OrientedFillStyle \
-	RoundButtonBorder \
 	ScaleTransform \
 	SimpleBorder \
 	SolidBackground \
-	SolidFillStyle \
 	SynchronousWindowSensor \
-	TranslationTransform \
-	TranslucentColor \
 	ViewStyle \
 	WindowEvent \
 	DeviceWorkstation \
@@ -119,6 +111,7 @@
 	SimpleView \
 	WidgetEvent \
 	WindowingTransformation \
+	XGraphicsContext \
 	FixedPaletteWithAlpha \
 	MonoMappedPalette \
 	ShadowView \
@@ -128,9 +121,6 @@
 	StandardSystemView \
 	ModalBox \
 
-WIN32_CLASSES= \
-	WinWorkstation \
-
 UNIX_CLASSES= \
 	FcConstants \
 	FcPattern \
@@ -139,6 +129,9 @@
 	XWorkstation \
 	GLXWorkstation \
 
+WIN32_CLASSES= \
+	WinWorkstation \
+
 
 
 
@@ -152,7 +145,6 @@
     $(OUTDIR)DeviceHandle.$(O) \
     $(OUTDIR)DisplayTransform.$(O) \
     $(OUTDIR)Event.$(O) \
-    $(OUTDIR)FillStyle.$(O) \
     $(OUTDIR)FontDescription.$(O) \
     $(OUTDIR)GraphicsContext.$(O) \
     $(OUTDIR)GraphicsDevice.$(O) \
@@ -166,7 +158,6 @@
     $(OUTDIR)WindowSensor.$(O) \
     $(OUTDIR)stx_libview.$(O) \
     $(OUTDIR)BeveledBorder.$(O) \
-    $(OUTDIR)BitmapFillStyle.$(O) \
     $(OUTDIR)BitmapFont.$(O) \
     $(OUTDIR)Border.$(O) \
     $(OUTDIR)ColorPalette.$(O) \
@@ -185,20 +176,14 @@
     $(OUTDIR)Font.$(O) \
     $(OUTDIR)Form.$(O) \
     $(OUTDIR)GradientBackground.$(O) \
-    $(OUTDIR)GradientFillStyle.$(O) \
     $(OUTDIR)HostGraphicsDevice.$(O) \
     $(OUTDIR)ImageBackground.$(O) \
     $(OUTDIR)MacButtonBorder.$(O) \
     $(OUTDIR)NoBackground.$(O) \
-    $(OUTDIR)OrientedFillStyle.$(O) \
-    $(OUTDIR)RoundButtonBorder.$(O) \
     $(OUTDIR)ScaleTransform.$(O) \
     $(OUTDIR)SimpleBorder.$(O) \
     $(OUTDIR)SolidBackground.$(O) \
-    $(OUTDIR)SolidFillStyle.$(O) \
     $(OUTDIR)SynchronousWindowSensor.$(O) \
-    $(OUTDIR)TranslationTransform.$(O) \
-    $(OUTDIR)TranslucentColor.$(O) \
     $(OUTDIR)ViewStyle.$(O) \
     $(OUTDIR)WindowEvent.$(O) \
     $(OUTDIR)DeviceWorkstation.$(O) \
@@ -222,9 +207,6 @@
     $(OUTDIR)ModalBox.$(O) \
     $(OUTDIR)extensions.$(O) \
 
-WIN32_OBJS= \
-    $(OUTDIR)WinWorkstation.$(O) \
-
 UNIX_OBJS= \
     $(OUTDIR)FcConstants.$(O) \
     $(OUTDIR)FcPattern.$(O) \
@@ -233,5 +215,8 @@
     $(OUTDIR)XWorkstation.$(O) \
     $(OUTDIR)GLXWorkstation.$(O) \
 
+WIN32_OBJS= \
+    $(OUTDIR)WinWorkstation.$(O) \
 
 
+

--- a/abbrev.stc	Tue Aug 15 14:54:58 2017 +0100
+++ b/abbrev.stc	Wed Sep 06 09:47:50 2017 +0200
@@ -12,7 +12,6 @@
 Event Event stx:libview 'Interface-Support-UI' 0
 FcConstants FcConstants stx:libview 'Graphics-Support-FontConfig' 0
 FontDescription FontDescription stx:libview 'Graphics-Support' 0
-GraphicsAttributes GraphicsAttributes stx:libview 'Graphics-Support' 0
 GraphicsContext GraphicsContext stx:libview 'Graphics-Support' 0
 GraphicsDevice GraphicsDevice stx:libview 'Interface-Graphics' 1
 GraphicsMedium GraphicsMedium stx:libview 'Graphics-Support' 0
@@ -29,7 +28,6 @@
 Border Border stx:libview 'Graphics-Support' 0
 ColorPalette ColorPalette stx:libview 'Graphics-Images-Support' 0
 CompoundFont CompoundFont stx:libview 'Graphics-Support' 0
-ControllerWithMenu ControllerWithMenu stx:libview 'Interface-Support-Controllers' 0
 Depth16Image Depth16Image stx:libview 'Graphics-Images' 0
 Depth1Image Depth1Image stx:libview 'Graphics-Images' 0
 Depth24Image Depth24Image stx:libview 'Graphics-Images' 0
@@ -49,16 +47,13 @@
 ImageBackground ImageBackground stx:libview 'Graphics-Support' 0
 MacButtonBorder MacButtonBorder stx:libview 'Graphics-Support' 0
 NoBackground NoBackground stx:libview 'Graphics-Support' 0
-RoundButtonBorder RoundButtonBorder stx:libview 'Graphics-Support' 0
 ScaleTransform ScaleTransform stx:libview 'Graphics-Transformations' 0
 SimpleBorder SimpleBorder stx:libview 'Graphics-Support' 0
 SolidBackground SolidBackground stx:libview 'Graphics-Support' 0
 SynchronousWindowSensor SynchronousWindowSensor stx:libview 'Interface-Support-UI' 0
-TranslucentColor TranslucentColor stx:libview 'Graphics-Support' 0
 ViewStyle ViewStyle stx:libview 'Views-Support' 0
 WindowEvent WindowEvent stx:libview 'Interface-Support-UI' 0
 XftFontDescription XftFontDescription stx:libview 'Graphics-Support' 0
-AlphaMask AlphaMask stx:libview 'Graphics-Images' 0
 DeviceWorkstation DeviceWorkstation stx:libview 'Interface-Graphics' 1
 DisplayRootView DisplayRootView stx:libview 'Views-Special' 0
 FixedPalette FixedPalette stx:libview 'Graphics-Images-Support' 0
@@ -72,18 +67,20 @@
 XGraphicsContext XGraphicsContext stx:libview 'Interface-Graphics' 0
 FixedPaletteWithAlpha FixedPaletteWithAlpha stx:libview 'Graphics-Images-Support' 0
 MonoMappedPalette MonoMappedPalette stx:libview 'Graphics-Images-Support' 0
-NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics' 1
 ShadowView ShadowView stx:libview 'Views-Special' 2
 View View stx:libview 'Views-Basic' 2
 XEmbedContainerView XEmbedContainerView stx:libview 'Views-XEmbed' 2
 XWorkstation XWorkstation stx:libview 'Interface-Graphics' 1
 GLXWorkstation GLXWorkstation stx:libview 'Interface-Graphics' 1
 TopView TopView stx:libview 'Views-Basic' 2
-MDIChildView MDIChildView stx:libview 'Views-Basic' 2
 PopUpView PopUpView stx:libview 'Views-Basic' 2
 StandardSystemView StandardSystemView stx:libview 'Views-Basic' 2
 ModalBox ModalBox stx:libview 'Views-Basic' 2
+RoundButtonBorder RoundButtonBorder stx:libview 'Graphics-Support' 0
+TranslucentColor TranslucentColor stx:libview 'Graphics-Support' 0
+AlphaMask AlphaMask stx:libview 'Graphics-Images' 0
+MDIChildView MDIChildView stx:libview 'Views-Basic' 2
 ControllerWithMenu ControllerWithMenu stx:libview 'Interface-Support-Controllers' 0
 GraphicsAttributes GraphicsAttributes stx:libview 'Graphics-Support' 0
-NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics' 0
+NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics' 1
 WinWorkstation WinWorkstation stx:libview  'unknownCategory'  0

--- a/bc.mak	Tue Aug 15 14:54:58 2017 +0100
+++ b/bc.mak	Wed Sep 06 09:47:50 2017 +0200
@@ -110,7 +110,7 @@
 $(OUTDIR)Image.$(O) Image.$(C) Image.$(H): Image.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ImageReader.$(O) ImageReader.$(C) ImageReader.$(H): ImageReader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)KeyboardForwarder.$(O) KeyboardForwarder.$(C) KeyboardForwarder.$(H): KeyboardForwarder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)KeyboardMap.$(O) KeyboardMap.$(C) KeyboardMap.$(H): KeyboardMap.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(STCHDR)
+$(OUTDIR)KeyboardMap.$(O) KeyboardMap.$(C) KeyboardMap.$(H): KeyboardMap.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ResourcePack.$(O) ResourcePack.$(C) ResourcePack.$(H): ResourcePack.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(STCHDR)
 $(OUTDIR)WindowGroup.$(O) WindowGroup.$(C) WindowGroup.$(H): WindowGroup.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(STCHDR)
 $(OUTDIR)WindowSensor.$(O) WindowSensor.$(C) WindowSensor.$(H): WindowSensor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)

--- a/stx_libview.st	Tue Aug 15 14:54:58 2017 +0100
+++ b/stx_libview.st	Wed Sep 06 09:47:50 2017 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
               All Rights Reserved
@@ -49,8 +47,8 @@
     but instead provides a device- and operating system independent layer on top of which
     GUI frameworks can be built.
 
-    It currently supports X11 and Windows-API. 
-    Native OSX support may be an option if there is sufficient demand for it 
+    It currently supports X11 and Windows-API.
+    Native OSX support may be an option if there is sufficient demand for it
     (i.e. someone is willing to pay for its development).
 "
 ! !
@@ -75,7 +73,7 @@
 
      Default is true (compile such method) but if the repository is mirror of CVS and
      you want to merge back to CVS at some point, you may want to not compile them
-     to keep changes against CVS minimal. 
+     to keep changes against CVS minimal.
 
      If false, version_HG is compiled only in classes that has been modified
      and commited.
@@ -146,8 +144,6 @@
     ^ #(
         #'stx:libbasic2'    "UUID - referenced by DisplayRootView>>uuid"
     )
-
-    "Modified: / 31-01-2017 / 13:35:33 / stefan"
 !
 
 subProjects
@@ -189,7 +185,7 @@
 
 additionalDefinitions_make_dot_proto
     ^ '
-LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
+LOCAL_SHARED_LIBS=-L$(X_LIB_DIR) $(LIB_GL) $(LIB_XEXT) $(LIB_XINERAMA) $(LIB_XFT) $(LIB_X) $(LIBRUN_LINK_LIB)
 '
 !
 
@@ -416,7 +412,6 @@
         Event
         (FcConstants unix)
         FontDescription
-        (GraphicsAttributes autoload)
         GraphicsContext
         GraphicsDevice
         GraphicsMedium
@@ -433,7 +428,6 @@
         Border
         ColorPalette
         CompoundFont
-        (ControllerWithMenu autoload)
         Depth16Image
         Depth1Image
         Depth24Image
@@ -453,16 +447,13 @@
         ImageBackground
         MacButtonBorder
         NoBackground
-        (RoundButtonBorder autoload)
         ScaleTransform
         SimpleBorder
         SolidBackground
         SynchronousWindowSensor
-        (TranslucentColor autoload)
         ViewStyle
         WindowEvent
         (XftFontDescription unix)
-        (AlphaMask autoload)
         DeviceWorkstation
         DisplayRootView
         FixedPalette
@@ -476,28 +467,28 @@
         XGraphicsContext
         FixedPaletteWithAlpha
         MonoMappedPalette
-        (NeXTWorkstation autoload)
         ShadowView
         View
         (XEmbedContainerView unix)
         (XWorkstation unix)
         (GLXWorkstation unix)
         TopView
-        (MDIChildView autoload)
         PopUpView
         StandardSystemView
         ModalBox
+        (RoundButtonBorder autoload)
+        (TranslucentColor autoload)
+        (AlphaMask autoload)
+        (MDIChildView autoload)
         (ControllerWithMenu autoload)
         (GraphicsAttributes autoload)
         (NeXTWorkstation autoload)
         (WinWorkstation win32)
     )
-
-    "Modified (format): / 31-01-2017 / 13:35:18 / stefan"
 !
 
 extensionMethodNames
-    "list class/selector pairs of extensions.
+    "lists the extension methods which are to be included in the project.
      Entries are 2-element array literals, consisting of class-name and selector.
      A correponding method with real names must be present in my concrete subclasses
      if it has extensions."
@@ -505,6 +496,7 @@
     ^ #(
         'ConfigurableFeatures class' hasFontConfig
         Object isColormap
+        Object isKeyboardMap
         'ConfigurableFeatures class' hasXFT
     )
 ! !
@@ -549,11 +541,11 @@
 
 version_CVS
     ^ '$Header$'
-    
+
 !
 
 version_HG
     ^ '$Changeset: <not expanded> $'
-    
+
 ! !