Skip to content

Commit 2d42e81

Browse files
committed
GSColorSliderCell: Move to libs-gui (gnustep#321)
This class is shared between the StandardPicker bundle and the WheelPicker bundles. Exposing a class with the same name in two separate bundles results in undefined behavior. Move this class to a shared module (libs-gui in this case) to resolve that.
1 parent 31f64d2 commit 2d42e81

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ColorPickers/GNUmakefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BUNDLE_NAME = StandardPicker NamedPicker WheelPicker
3434

3535
BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ColorPickers
3636

37-
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers
37+
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers -I../Source
3838

3939
ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Models/$(GNUSTEP_OBJ_DIR)
4040

@@ -43,10 +43,9 @@ StandardPicker_OBJC_FILES = GSStandardColorPicker.m \
4343
GSRGBColorPicker.m \
4444
GSCMYKColorPicker.m \
4545
GSHSBColorPicker.m \
46-
GSGrayColorPicker.m \
47-
GSColorSliderCell.m
46+
GSGrayColorPicker.m
4847
NamedPicker_OBJC_FILES = GSNamedColorPicker.m
49-
WheelPicker_OBJC_FILES = GSWheelColorPicker.m GSColorSliderCell.m
48+
WheelPicker_OBJC_FILES = GSWheelColorPicker.m
5049

5150
# The class to load
5251
StandardPicker_PRINCIPAL_CLASS = GSStandardColorPicker

Source/GNUmakefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ GSXibKeyedUnarchiver.m \
263263
GSXib5KeyedUnarchiver.m \
264264
GSXibObjectContainer.m \
265265
GSXibParser.m \
266-
GSHelpAttachment.m
266+
GSHelpAttachment.m \
267+
GSColorSliderCell.m
267268

268269
# Turn off NSMenuItem warning that NSMenuItem conforms to <NSObject>,
269270
# but does not implement <NSObject>'s methods itself (it inherits
File renamed without changes.

ColorPickers/GSColorSliderCell.m renamed to Source/GSColorSliderCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Commit ID: 279df922187d7242a93dde9b53d646449a7c4b8e
44
// Date: 2015-06-25 22:00:17 +0000
55
// ========== End of Keysight Technologies Notice ==========
6-
/* GSStandardColorPicker.m
6+
/* GSColorSliderCell.m
77
88
Copyright (C) 2007 Free Software Foundation, Inc.
99

0 commit comments

Comments
 (0)