Skip to content

Commit 68e2716

Browse files
authored
GSColorSliderCell: Move to libs-gui (#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 82717ee commit 68e2716

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-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
@@ -373,7 +373,8 @@ GSCSLinearExpression.m \
373373
GSCSStrength.m \
374374
GSCSEditInfo.m \
375375
GSCSEditVariableManager.m \
376-
GSCSTableau.m
376+
GSCSTableau.m \
377+
GSColorSliderCell.m
377378

378379
# Turn off NSMenuItem warning that NSMenuItem conforms to <NSObject>,
379380
# but does not implement <NSObject>'s methods itself (it inherits

ColorPickers/GSColorSliderCell.h renamed to Source/GSColorSliderCell.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include <AppKit/NSSliderCell.h>
3333

34+
APPKIT_EXPORT_CLASS
3435
@interface GSColorSliderCell : NSSliderCell
3536
{
3637
int mode;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* GSStandardColorPicker.m
1+
/* GSColorSliderCell.m
22
33
Copyright (C) 2007 Free Software Foundation, Inc.
44

0 commit comments

Comments
 (0)