Backed out changeset 863abc9d17bb
...as it messed up build support files - win32 specific
classes went missing. This was proably a consequence of
an issue #63 [1] which is now fixed.
[1]: https://swing.fit.cvut.cz/projects/stx-jv/ticket/63
--- a/Image.st Tue Aug 15 08:26:26 2017 +0100
+++ b/Image.st Tue Aug 15 13:46:01 2017 +0100
@@ -12568,19 +12568,6 @@
self photometric:(self class defaultPhotometric)
! !
-!Image methodsFor:'inspecting'!
-
-inspector2TabImageGraySacel
- <inspector2Tab>
-
- ^ self newInspector2Tab
- label: 'Grayscale';
- priority: 45;
- view: ((HVScrollableView for:ImageView) image: (self asGrayImageDepth: self depth);
- yourself)
-
- "Created: / 08-06-2017 / 14:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
!Image methodsFor:'instance release'!
--- a/Make.proto Tue Aug 15 08:26:26 2017 +0100
+++ b/Make.proto Tue Aug 15 13:46:01 2017 +0100
@@ -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/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)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 08:26:26 2017 +0100
+++ b/Make.spec Tue Aug 15 13:46:01 2017 +0100
@@ -60,6 +60,7 @@
DeviceHandle \
DisplayTransform \
Event \
+ FillStyle \
FontDescription \
GraphicsContext \
GraphicsDevice \
@@ -73,6 +74,7 @@
WindowSensor \
stx_libview \
BeveledBorder \
+ BitmapFillStyle \
BitmapFont \
Border \
ColorPalette \
@@ -91,14 +93,20 @@
Font \
Form \
GradientBackground \
+ GradientFillStyle \
HostGraphicsDevice \
ImageBackground \
MacButtonBorder \
NoBackground \
+ OrientedFillStyle \
+ RoundButtonBorder \
ScaleTransform \
SimpleBorder \
SolidBackground \
+ SolidFillStyle \
SynchronousWindowSensor \
+ TranslationTransform \
+ TranslucentColor \
ViewStyle \
WindowEvent \
DeviceWorkstation \
@@ -111,7 +119,6 @@
SimpleView \
WidgetEvent \
WindowingTransformation \
- XGraphicsContext \
FixedPaletteWithAlpha \
MonoMappedPalette \
ShadowView \
@@ -121,6 +128,9 @@
StandardSystemView \
ModalBox \
+WIN32_CLASSES= \
+ WinWorkstation \
+
UNIX_CLASSES= \
FcConstants \
FcPattern \
@@ -142,6 +152,7 @@
$(OUTDIR)DeviceHandle.$(O) \
$(OUTDIR)DisplayTransform.$(O) \
$(OUTDIR)Event.$(O) \
+ $(OUTDIR)FillStyle.$(O) \
$(OUTDIR)FontDescription.$(O) \
$(OUTDIR)GraphicsContext.$(O) \
$(OUTDIR)GraphicsDevice.$(O) \
@@ -155,6 +166,7 @@
$(OUTDIR)WindowSensor.$(O) \
$(OUTDIR)stx_libview.$(O) \
$(OUTDIR)BeveledBorder.$(O) \
+ $(OUTDIR)BitmapFillStyle.$(O) \
$(OUTDIR)BitmapFont.$(O) \
$(OUTDIR)Border.$(O) \
$(OUTDIR)ColorPalette.$(O) \
@@ -173,14 +185,20 @@
$(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) \
@@ -204,6 +222,9 @@
$(OUTDIR)ModalBox.$(O) \
$(OUTDIR)extensions.$(O) \
+WIN32_OBJS= \
+ $(OUTDIR)WinWorkstation.$(O) \
+
UNIX_OBJS= \
$(OUTDIR)FcConstants.$(O) \
$(OUTDIR)FcPattern.$(O) \
--- a/abbrev.stc Tue Aug 15 08:26:26 2017 +0100
+++ b/abbrev.stc Tue Aug 15 13:46:01 2017 +0100
@@ -12,6 +12,7 @@
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
@@ -28,6 +29,7 @@
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
@@ -47,13 +49,16 @@
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
@@ -67,19 +72,18 @@
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
-AlphaMask AlphaMask stx:libview 'Graphics-Images' 0
ControllerWithMenu ControllerWithMenu stx:libview 'Interface-Support-Controllers' 0
GraphicsAttributes GraphicsAttributes stx:libview 'Graphics-Support' 0
-MDIChildView MDIChildView stx:libview 'Views-Basic' 2
-NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics' 1
-RoundButtonBorder RoundButtonBorder stx:libview 'Graphics-Support' 0
-TranslucentColor TranslucentColor stx:libview 'Graphics-Support' 0
+NeXTWorkstation NeXTWorkstation stx:libview 'Interface-Graphics' 0
+WinWorkstation WinWorkstation stx:libview 'unknownCategory' 0
--- a/bc.mak Tue Aug 15 08:26:26 2017 +0100
+++ b/bc.mak Tue Aug 15 13:46:01 2017 +0100
@@ -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\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)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)
@@ -163,6 +163,7 @@
$(OUTDIR)PopUpView.$(O) PopUpView.$(C) PopUpView.$(H): PopUpView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
$(OUTDIR)StandardSystemView.$(O) StandardSystemView.$(C) StandardSystemView.$(H): StandardSystemView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
$(OUTDIR)ModalBox.$(O) ModalBox.$(C) ModalBox.$(H): ModalBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
+$(OUTDIR)WinWorkstation.$(O) WinWorkstation.$(C) WinWorkstation.$(H): WinWorkstation.st $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/libInit.cc Tue Aug 15 08:26:26 2017 +0100
+++ b/libInit.cc Tue Aug 15 13:46:01 2017 +0100
@@ -93,6 +93,9 @@
extern void _XWorkstation_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
extern void _GLXWorkstation_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
#endif /* UNIX */
+#ifdef WIN32
+extern void _WinWorkstation_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+#endif /* WIN32 */
extern void _stx_137libview_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -184,6 +187,9 @@
_XWorkstation_Init(pass,__pRT__,snd);
_GLXWorkstation_Init(pass,__pRT__,snd);
#endif /* UNIX */
+#ifdef WIN32
+ _WinWorkstation_Init(pass,__pRT__,snd);
+#endif /* WIN32 */
_stx_137libview_extensions_Init(pass,__pRT__,snd);
__END_PACKAGE__();
--- a/stx_libview.st Tue Aug 15 08:26:26 2017 +0100
+++ b/stx_libview.st Tue Aug 15 13:46:01 2017 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
All Rights Reserved
@@ -144,6 +146,8 @@
^ #(
#'stx:libbasic2' "UUID - referenced by DisplayRootView>>uuid"
)
+
+ "Modified: / 31-01-2017 / 13:35:33 / stefan"
!
subProjects
@@ -412,6 +416,7 @@
Event
(FcConstants unix)
FontDescription
+ (GraphicsAttributes autoload)
GraphicsContext
GraphicsDevice
GraphicsMedium
@@ -428,6 +433,7 @@
Border
ColorPalette
CompoundFont
+ (ControllerWithMenu autoload)
Depth16Image
Depth1Image
Depth24Image
@@ -447,13 +453,16 @@
ImageBackground
MacButtonBorder
NoBackground
+ (RoundButtonBorder autoload)
ScaleTransform
SimpleBorder
SolidBackground
SynchronousWindowSensor
+ (TranslucentColor autoload)
ViewStyle
WindowEvent
(XftFontDescription unix)
+ (AlphaMask autoload)
DeviceWorkstation
DisplayRootView
FixedPalette
@@ -467,27 +476,28 @@
XGraphicsContext
FixedPaletteWithAlpha
MonoMappedPalette
+ (NeXTWorkstation autoload)
ShadowView
View
(XEmbedContainerView unix)
(XWorkstation unix)
(GLXWorkstation unix)
TopView
+ (MDIChildView autoload)
PopUpView
StandardSystemView
ModalBox
- (AlphaMask autoload)
(ControllerWithMenu autoload)
(GraphicsAttributes autoload)
- (MDIChildView autoload)
(NeXTWorkstation autoload)
- (RoundButtonBorder autoload)
- (TranslucentColor autoload)
+ (WinWorkstation win32)
)
+
+ "Modified (format): / 31-01-2017 / 13:35:18 / stefan"
!
extensionMethodNames
- "lists the extension methods which are to be included in the project.
+ "list class/selector pairs of extensions.
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."
@@ -496,7 +506,6 @@
'ConfigurableFeatures class' hasFontConfig
Object isColormap
'ConfigurableFeatures class' hasXFT
- Object isKeyboardMap
)
! !