Browse Source

Removed some old compiler bug workarounds

tags/2021-05-28
jules 8 years ago
parent
commit
357dd2c9c9
53 changed files with 103 additions and 131 deletions
  1. +1
    -1
      examples/AUv3Synth/Source/AUv3SynthEditor.h
  2. +2
    -2
      examples/Demo/Source/Demos/CameraDemo.cpp
  3. +1
    -1
      examples/Demo/Source/Demos/LiveConstantDemo.cpp
  4. +1
    -1
      examples/Demo/Source/Demos/ValueTreesDemo.cpp
  5. +1
    -1
      examples/Demo/Source/Demos/WebBrowserDemo.cpp
  6. +4
    -4
      examples/Demo/Source/Demos/WidgetsDemo.cpp
  7. +1
    -1
      examples/HelloWorld/Source/MainComponent.h
  8. +1
    -1
      examples/MidiTest/Source/MainComponent.h
  9. +1
    -1
      examples/PlugInSamples/GenericEditor.h
  10. +1
    -1
      examples/PlugInSamples/InterAppAudioEffect/Source/IAAEffectEditor.h
  11. +1
    -1
      examples/PlugInSamples/Surround/Source/SurroundEditor.h
  12. +1
    -1
      extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
  13. +1
    -1
      extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.cpp
  14. +1
    -1
      extras/Projucer/Source/ComponentEditor/components/jucer_ButtonHandler.h
  15. +1
    -1
      extras/Projucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h
  16. +1
    -1
      extras/Projucer/Source/ComponentEditor/components/jucer_SliderHandler.h
  17. +1
    -1
      extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h
  18. +1
    -1
      extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h
  19. +1
    -1
      extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
  20. +1
    -1
      extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h
  21. +1
    -1
      extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h
  22. +1
    -1
      extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h
  23. +1
    -1
      extras/Projucer/Source/Utility/jucer_EditorColourSchemeWindowComponent.h
  24. +1
    -1
      extras/Projucer/Source/Utility/jucer_TranslationToolComponent.h
  25. +5
    -5
      extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h
  26. +1
    -1
      modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
  27. +1
    -1
      modules/juce_audio_processors/scanning/juce_PluginListComponent.h
  28. +2
    -2
      modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp
  29. +1
    -1
      modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
  30. +4
    -11
      modules/juce_gui_basics/buttons/juce_Button.cpp
  31. +1
    -1
      modules/juce_gui_basics/buttons/juce_Button.h
  32. +3
    -3
      modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h
  33. +1
    -1
      modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h
  34. +1
    -1
      modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h
  35. +2
    -2
      modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h
  36. +1
    -1
      modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp
  37. +1
    -1
      modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h
  38. +1
    -1
      modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h
  39. +1
    -1
      modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h
  40. +1
    -1
      modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h
  41. +1
    -1
      modules/juce_gui_basics/widgets/juce_ComboBox.cpp
  42. +1
    -1
      modules/juce_gui_basics/widgets/juce_ComboBox.h
  43. +1
    -1
      modules/juce_gui_basics/widgets/juce_Label.cpp
  44. +35
    -56
      modules/juce_gui_basics/widgets/juce_Slider.cpp
  45. +2
    -2
      modules/juce_gui_basics/widgets/juce_Toolbar.cpp
  46. +1
    -1
      modules/juce_gui_basics/widgets/juce_Toolbar.h
  47. +1
    -1
      modules/juce_gui_basics/windows/juce_AlertWindow.h
  48. +1
    -1
      modules/juce_gui_basics/windows/juce_DocumentWindow.cpp
  49. +1
    -1
      modules/juce_gui_extra/misc/juce_ColourSelector.h
  50. +1
    -1
      modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp
  51. +1
    -1
      modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
  52. +1
    -1
      modules/juce_gui_extra/misc/juce_PreferencesPanel.h
  53. +1
    -1
      modules/juce_product_unlocking/marketplace/juce_OnlineUnlockForm.h

+ 1
- 1
examples/AUv3Synth/Source/AUv3SynthEditor.h View File

@@ -28,7 +28,7 @@
//==============================================================================
class AUv3SynthEditor : public AudioProcessorEditor,
public ButtonListener,
public Button::Listener,
public Slider::Listener,
private Timer
{


+ 2
- 2
examples/Demo/Source/Demos/CameraDemo.cpp View File

@@ -30,8 +30,8 @@
//==============================================================================
class CameraDemo : public Component,
private ComboBoxListener,
private ButtonListener,
private ComboBox::Listener,
private Button::Listener,
private CameraDevice::Listener,
private AsyncUpdater
{


+ 1
- 1
examples/Demo/Source/Demos/LiveConstantDemo.cpp View File

@@ -58,7 +58,7 @@ struct LiveConstantDemoComponent : public Component
//==============================================================================
class LiveConstantEditorDemo : public Component,
private ButtonListener
private Button::Listener
{
public:
LiveConstantEditorDemo()


+ 1
- 1
examples/Demo/Source/Demos/ValueTreesDemo.cpp View File

@@ -158,7 +158,7 @@ private:
//==============================================================================
class ValueTreesDemo : public Component,
public DragAndDropContainer,
private ButtonListener,
private Button::Listener,
private Timer
{
public:


+ 1
- 1
examples/Demo/Source/Demos/WebBrowserDemo.cpp View File

@@ -70,7 +70,7 @@ private:
//==============================================================================
class WebBrowserDemo : public Component,
private TextEditor::Listener,
private ButtonListener
private Button::Listener
{
public:
WebBrowserDemo()


+ 4
- 4
examples/Demo/Source/Demos/WidgetsDemo.cpp View File

@@ -226,7 +226,7 @@ private:
//==============================================================================
struct ButtonsPage : public Component,
public ButtonListener
public Button::Listener
{
ButtonsPage()
{
@@ -459,8 +459,8 @@ struct MiscPage : public Component
//==============================================================================
class ToolbarDemoComp : public Component,
public SliderListener,
public ButtonListener
public Slider::Listener,
public Button::Listener
{
public:
ToolbarDemoComp()
@@ -943,7 +943,7 @@ private:
// This is a custom component containing a combo box, which we're going to put inside
// our table's "rating" column.
class RatingColumnCustomComponent : public Component,
private ComboBoxListener
private ComboBox::Listener
{
public:
RatingColumnCustomComponent (TableDemoComponent& td) : owner (td)


+ 1
- 1
examples/HelloWorld/Source/MainComponent.h View File

@@ -34,7 +34,7 @@
//[/Comments]
*/
class MainComponent : public Component,
public ButtonListener
public Button::Listener
{
public:
//==============================================================================


+ 1
- 1
examples/MidiTest/Source/MainComponent.h View File

@@ -39,7 +39,7 @@ class MainContentComponent : public Component,
private MidiKeyboardStateListener,
private MidiInputCallback,
private MessageListener,
private ButtonListener
private Button::Listener
{
public:
//==============================================================================


+ 1
- 1
examples/PlugInSamples/GenericEditor.h View File

@@ -25,7 +25,7 @@
*/
class GenericEditor : public AudioProcessorEditor,
public SliderListener,
public Slider::Listener,
private Timer
{
public:


+ 1
- 1
examples/PlugInSamples/InterAppAudioEffect/Source/IAAEffectEditor.h View File

@@ -33,7 +33,7 @@
class IAAEffectEditor : public AudioProcessorEditor,
private IAAEffectProcessor::MeterListener,
private ButtonListener,
private Button::Listener,
private Timer
{
public:


+ 1
- 1
examples/PlugInSamples/Surround/Source/SurroundEditor.h View File

@@ -33,7 +33,7 @@ public:
};
class SurroundEditor : public AudioProcessorEditor,
public ButtonListener,
public Button::Listener,
private Timer
{
public:


+ 1
- 1
extras/Projucer/Source/Application/jucer_AutoUpdater.cpp View File

@@ -233,7 +233,7 @@ public:
//==============================================================================
class UpdateUserDialog : public Component,
public ButtonListener
public Button::Listener
{
public:
UpdateUserDialog (const LatestVersionChecker::JuceVersionTriple& version,


+ 1
- 1
extras/Projucer/Source/Code Editor/jucer_SourceCodeEditor.cpp View File

@@ -347,7 +347,7 @@ void GenericCodeEditorComponent::removeListener (GenericCodeEditorComponent::Lis
//==============================================================================
class GenericCodeEditorComponent::FindPanel : public Component,
private TextEditor::Listener,
private ButtonListener
private Button::Listener
{
public:
FindPanel()


+ 1
- 1
extras/Projucer/Source/ComponentEditor/components/jucer_ButtonHandler.h View File

@@ -142,7 +142,7 @@ public:
if (needsButtonListener (component))
{
String& callback = code.getCallbackCode ("public ButtonListener",
String& callback = code.getCallbackCode ("public Button::Listener",
"void",
"buttonClicked (Button* buttonThatWasClicked)",
true);


+ 1
- 1
extras/Projucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h View File

@@ -136,7 +136,7 @@ public:
if (needsCallback (component))
{
String& callback = code.getCallbackCode ("public ComboBoxListener",
String& callback = code.getCallbackCode ("public ComboBox::Listener",
"void",
"comboBoxChanged (ComboBox* comboBoxThatHasChanged)",
true);


+ 1
- 1
extras/Projucer/Source/ComponentEditor/components/jucer_SliderHandler.h View File

@@ -155,7 +155,7 @@ struct SliderHandler : public ComponentTypeHandler
if (needsSliderListener (component))
{
String& callback = code.getCallbackCode ("public SliderListener",
String& callback = code.getCallbackCode ("public Slider::Listener",
"void",
"sliderValueChanged (Slider* sliderThatWasMoved)",
true);


+ 1
- 1
extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h View File

@@ -102,7 +102,7 @@ public:
}
class ColourSelectorComp : public Component,
public ButtonListener
public Button::Listener
{
public:
ColourSelectorComp (ColourEditorComponent* owner_,


+ 1
- 1
extras/Projucer/Source/ComponentEditor/properties/jucer_PositionPropertyBase.h View File

@@ -35,7 +35,7 @@
*/
class PositionPropertyBase : public PropertyComponent,
protected ChangeListener,
private ButtonListener
private Button::Listener
{
public:
enum ComponentPositionDimension


+ 1
- 1
extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp View File

@@ -30,7 +30,7 @@
//==============================================================================
class ResourceListButton : public Component,
private ButtonListener
private Button::Listener
{
public:
ResourceListButton (JucerDocument& doc)


+ 1
- 1
extras/Projucer/Source/ComponentEditor/ui/jucer_ResourceEditorPanel.h View File

@@ -32,7 +32,7 @@
class ResourceEditorPanel : public Component,
private TableListBoxModel,
private ChangeListener,
private ButtonListener
private Button::Listener
{
public:
ResourceEditorPanel (JucerDocument& document);


+ 1
- 1
extras/Projucer/Source/Project/jucer_ConfigTree_Modules.h View File

@@ -313,7 +313,7 @@ private:
//==============================================================================
class MissingDependenciesComponent : public PropertyComponent,
public ButtonListener
public Button::Listener
{
public:
MissingDependenciesComponent (Project& p, const String& modID)


+ 1
- 1
extras/Projucer/Source/Utility/jucer_ColourPropertyComponent.h View File

@@ -140,7 +140,7 @@ private:
struct PopupColourSelector : public Component,
public ChangeListener,
public Value::Listener,
public ButtonListener
public Button::Listener
{
PopupColourSelector (const Value& colour,
Colour defaultCol,


+ 1
- 1
extras/Projucer/Source/Utility/jucer_EditorColourSchemeWindowComponent.h View File

@@ -123,7 +123,7 @@ private:
//==============================================================================
struct EditorPanel : public Component,
private ButtonListener
private Button::Listener
{
EditorPanel()
: loadButton ("Load Scheme..."),


+ 1
- 1
extras/Projucer/Source/Utility/jucer_TranslationToolComponent.h View File

@@ -31,7 +31,7 @@
//==============================================================================
class TranslationToolComponent : public Component,
public ButtonListener
public Button::Listener
{
public:
TranslationToolComponent()


+ 5
- 5
extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h View File

@@ -28,8 +28,8 @@
class ModulesFolderPathBox : public Component,
private ButtonListener,
private ComboBoxListener
private Button::Listener,
private ComboBox::Listener
{
public:
ModulesFolderPathBox (File initialFileOrDirectory)
@@ -295,9 +295,9 @@ private:
a list box of platform targets to generate.
*/
class WizardComp : public Component,
private ButtonListener,
private ComboBoxListener,
private TextEditorListener,
private Button::Listener,
private ComboBox::Listener,
private TextEditor::Listener,
private FileBrowserListener
{
public:


+ 1
- 1
modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h View File

@@ -552,7 +552,7 @@ private:
that the other plugin wrappers use.
*/
class StandaloneFilterWindow : public DocumentWindow,
public ButtonListener // (can't use Button::Listener due to VC2005 bug)
public Button::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_audio_processors/scanning/juce_PluginListComponent.h View File

@@ -35,7 +35,7 @@
class JUCE_API PluginListComponent : public Component,
public FileDragAndDropTarget,
private ChangeListener,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
public:
//==============================================================================


+ 2
- 2
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp View File

@@ -199,8 +199,8 @@ static String getNoDeviceString() { return "<< " + TRANS("none") + " >>"; }
//==============================================================================
class AudioDeviceSettingsPanel : public Component,
private ChangeListener,
private ComboBoxListener, // (can't use ComboBox::Listener due to idiotic VC2005 bug)
private ButtonListener
private ComboBox::Listener,
private Button::Listener
{
public:
AudioDeviceSettingsPanel (AudioIODeviceType& t, AudioDeviceSetupDetails& setupDetails,


+ 1
- 1
modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h View File

@@ -37,8 +37,8 @@
@see AudioDeviceManager
*/
class JUCE_API AudioDeviceSelectorComponent : public Component,
private ComboBoxListener, // (can't use ComboBox::Listener due to idiotic VC2005 bug)
private ChangeListener,
private ComboBox::Listener,
private Button::Listener,
private Timer
{


+ 4
- 11
modules/juce_gui_basics/buttons/juce_Button.cpp View File

@@ -394,15 +394,8 @@ void Button::handleCommandMessage (int commandId)
}
//==============================================================================
void Button::addListener (ButtonListener* const newListener)
{
buttonListeners.add (newListener);
}
void Button::removeListener (ButtonListener* const listener)
{
buttonListeners.remove (listener);
}
void Button::addListener (Listener* l) { buttonListeners.add (l); }
void Button::removeListener (Listener* l) { buttonListeners.remove (l); }
void Button::sendClickMessage (const ModifierKeys& modifiers)
{
@@ -420,7 +413,7 @@ void Button::sendClickMessage (const ModifierKeys& modifiers)
clicked (modifiers);
if (! checker.shouldBailOut())
buttonListeners.callChecked (checker, &ButtonListener::buttonClicked, this); // (can't use Button::Listener due to idiotic VC2005 bug)
buttonListeners.callChecked (checker, &Button::Listener::buttonClicked, this);
}
void Button::sendStateMessage()
@@ -430,7 +423,7 @@ void Button::sendStateMessage()
buttonStateChanged();
if (! checker.shouldBailOut())
buttonListeners.callChecked (checker, &ButtonListener::buttonStateChanged, this);
buttonListeners.callChecked (checker, &Button::Listener::buttonStateChanged, this);
}
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/buttons/juce_Button.h View File

@@ -397,7 +397,7 @@ protected:
Subclasses can override this to perform whatever they actions they need
to do.
Alternatively, a ButtonListener can be added to the button, and these listeners
Alternatively, a Button::Listener can be added to the button, and these listeners
will be called when the click occurs.
@see triggerClick


+ 3
- 3
modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h View File

@@ -39,9 +39,9 @@
*/
class JUCE_API FileBrowserComponent : public Component,
private FileBrowserListener,
private TextEditorListener,
private ButtonListener,
private ComboBoxListener, // (can't use ComboBox::Listener due to idiotic VC2005 bug)
private TextEditor::Listener,
private Button::Listener,
private ComboBox::Listener,
private FileFilter,
private Timer
{


+ 1
- 1
modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h View File

@@ -63,7 +63,7 @@
@see FileChooser
*/
class JUCE_API FileChooserDialogBox : public ResizableWindow,
private ButtonListener, // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener,
private FileBrowserListener
{
public:


+ 1
- 1
modules/juce_gui_basics/filebrowser/juce_FileSearchPathListComponent.h View File

@@ -37,7 +37,7 @@
class JUCE_API FileSearchPathListComponent : public Component,
public SettableTooltipClient,
public FileDragAndDropTarget,
private ButtonListener, // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener,
private ListBoxModel
{
public:


+ 2
- 2
modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h View File

@@ -65,8 +65,8 @@ class JUCE_API FilenameComponent : public Component,
public SettableTooltipClient,
public FileDragAndDropTarget,
private AsyncUpdater,
private ButtonListener, // (can't use Button::Listener due to idiotic VC2005 bug)
private ComboBoxListener
private Button::Listener,
private ComboBox::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/layout/juce_TabbedButtonBar.cpp View File

@@ -169,7 +169,7 @@ void TabBarButton::resized()
//==============================================================================
class TabbedButtonBar::BehindFrontTabComp : public Component,
public ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
public Button::Listener
{
public:
BehindFrontTabComp (TabbedButtonBar& tb) : owner (tb)


+ 1
- 1
modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h View File

@@ -37,7 +37,7 @@
@see PropertyComponent
*/
class JUCE_API BooleanPropertyComponent : public PropertyComponent,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
protected:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h View File

@@ -37,7 +37,7 @@
@see PropertyComponent
*/
class JUCE_API ButtonPropertyComponent : public PropertyComponent,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h View File

@@ -47,7 +47,7 @@
@see PropertyComponent, PropertyPanel
*/
class JUCE_API ChoicePropertyComponent : public PropertyComponent,
private ComboBoxListener // (can't use ComboBox::Listener due to idiotic VC2005 bug)
private ComboBox::Listener
{
protected:
/** Creates the component.


+ 1
- 1
modules/juce_gui_basics/properties/juce_SliderPropertyComponent.h View File

@@ -34,7 +34,7 @@
@see PropertyComponent, Slider
*/
class JUCE_API SliderPropertyComponent : public PropertyComponent,
private SliderListener // (can't use Slider::Listener due to idiotic VC2005 bug)
private Slider::Listener
{
protected:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/widgets/juce_ComboBox.cpp View File

@@ -627,7 +627,7 @@ void ComboBox::removeListener (ComboBoxListener* listener) { listeners.remove
void ComboBox::handleAsyncUpdate()
{
Component::BailOutChecker checker (this);
listeners.callChecked (checker, &ComboBoxListener::comboBoxChanged, this); // (can't use ComboBox::Listener due to idiotic VC2005 bug)
listeners.callChecked (checker, &ComboBox::Listener::comboBoxChanged, this);
}
void ComboBox::sendChange (const NotificationType notification)


+ 1
- 1
modules/juce_gui_basics/widgets/juce_ComboBox.h View File

@@ -44,7 +44,7 @@
*/
class JUCE_API ComboBox : public Component,
public SettableTooltipClient,
public LabelListener, // (can't use Label::Listener due to idiotic VC2005 bug)
public Label::Listener,
public ValueListener,
private AsyncUpdater
{


+ 1
- 1
modules/juce_gui_basics/widgets/juce_Label.cpp View File

@@ -416,7 +416,7 @@ void Label::removeListener (LabelListener* const listener)
void Label::callChangeListeners()
{
Component::BailOutChecker checker (this);
listeners.callChecked (checker, &LabelListener::labelTextChanged, this); // (can't use Label::Listener due to idiotic VC2005 bug)
listeners.callChecked (checker, &Label::Listener::labelTextChanged, this);
}
//==============================================================================


+ 35
- 56
modules/juce_gui_basics/widgets/juce_Slider.cpp View File

@@ -25,36 +25,15 @@
*/
class Slider::Pimpl : public AsyncUpdater,
public ButtonListener, // (can't use Button::Listener due to idiotic VC2005 bug)
public LabelListener,
public Button::Listener,
public Label::Listener,
public ValueListener
{
public:
Pimpl (Slider& s, SliderStyle sliderStyle, TextEntryBoxPosition textBoxPosition)
: owner (s),
style (sliderStyle),
lastCurrentValue (0), lastValueMin (0), lastValueMax (0),
minimum (0), maximum (10), interval (0), doubleClickReturnValue (0),
skewFactor (1.0), symmetricSkew (false), velocityModeSensitivity (1.0),
velocityModeOffset (0.0), velocityModeThreshold (1),
sliderRegionStart (0), sliderRegionSize (1), sliderBeingDragged (-1),
pixelsForFullDragExtent (250),
textBoxPos (textBoxPosition),
numDecimalPlaces (7),
textBoxWidth (80), textBoxHeight (20),
incDecButtonMode (incDecButtonsNotDraggable),
editableText (true),
doubleClickToValue (false),
isVelocityBased (false),
userKeyOverridesVelocity (true),
incDecButtonsSideBySide (false),
sendChangeOnlyOnRelease (false),
popupDisplayEnabled (false),
menuEnabled (false),
useDragEvents (false),
scrollWheelEnabled (true),
snapsToMousePos (true),
parentForPopupDisplay (nullptr)
textBoxPos (textBoxPosition)
{
rotaryParams.startAngleRadians = float_Pi * 1.2f;
rotaryParams.endAngleRadians = float_Pi * 2.8f;
@@ -344,7 +323,7 @@ public:
Component::BailOutChecker checker (&owner);
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderValueChanged, slider); // (can't use Slider::Listener due to idiotic VC2005 bug)
listeners.callChecked (checker, &Slider::Listener::sliderValueChanged, slider);
}
void sendDragStart()
@@ -353,7 +332,7 @@ public:
Component::BailOutChecker checker (&owner);
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderDragStarted, slider);
listeners.callChecked (checker, &Slider::Listener::sliderDragStarted, slider);
}
void sendDragEnd()
@@ -364,7 +343,7 @@ public:
Component::BailOutChecker checker (&owner);
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderDragEnded, slider);
listeners.callChecked (checker, &Slider::Listener::sliderDragEnded, slider);
}
struct DragInProgress
@@ -1188,41 +1167,41 @@ public:
Slider& owner;
SliderStyle style;
ListenerList <SliderListener> listeners;
ListenerList<Slider::Listener> listeners;
Value currentValue, valueMin, valueMax;
double lastCurrentValue, lastValueMin, lastValueMax;
double minimum, maximum, interval, doubleClickReturnValue;
double valueWhenLastDragged, valueOnMouseDown, skewFactor, lastAngle;
bool symmetricSkew;
double velocityModeSensitivity, velocityModeOffset, minMaxDiff;
int velocityModeThreshold;
double lastCurrentValue = 0, lastValueMin = 0, lastValueMax = 0;
double minimum = 0, maximum = 10, interval = 0, doubleClickReturnValue = 0;
double valueWhenLastDragged = 0, valueOnMouseDown = 0, skewFactor = 1.0, lastAngle = 0;
bool symmetricSkew = false;
double velocityModeSensitivity = 1.0, velocityModeOffset = 0, minMaxDiff = 0;
int velocityModeThreshold = 1;
RotaryParameters rotaryParams;
Point<float> mouseDragStartPos, mousePosWhenLastDragged;
int sliderRegionStart, sliderRegionSize;
int sliderBeingDragged;
int pixelsForFullDragExtent;
int sliderRegionStart = 0, sliderRegionSize = 1;
int sliderBeingDragged = -1;
int pixelsForFullDragExtent = 250;
Time lastMouseWheelTime;
Rectangle<int> sliderRect;
ScopedPointer<DragInProgress> currentDrag;
TextEntryBoxPosition textBoxPos;
String textSuffix;
int numDecimalPlaces;
int textBoxWidth, textBoxHeight;
IncDecButtonMode incDecButtonMode;
bool editableText;
bool doubleClickToValue;
bool isVelocityBased;
bool userKeyOverridesVelocity;
bool incDecButtonsSideBySide;
bool sendChangeOnlyOnRelease;
bool popupDisplayEnabled;
bool menuEnabled;
bool useDragEvents;
bool incDecDragged;
bool scrollWheelEnabled;
bool snapsToMousePos;
int numDecimalPlaces = 7;
int textBoxWidth = 80, textBoxHeight = 20;
IncDecButtonMode incDecButtonMode = incDecButtonsNotDraggable;
bool editableText = true;
bool doubleClickToValue = false;
bool isVelocityBased = false;
bool userKeyOverridesVelocity = true;
bool incDecButtonsSideBySide = false;
bool sendChangeOnlyOnRelease = false;
bool popupDisplayEnabled = false;
bool menuEnabled = false;
bool useDragEvents = false;
bool incDecDragged = false;
bool scrollWheelEnabled = true;
bool snapsToMousePos = true;
ScopedPointer<Label> valueBox;
ScopedPointer<Button> incButton, decButton;
@@ -1275,7 +1254,7 @@ public:
};
ScopedPointer<PopupDisplayComponent> popupDisplay;
Component* parentForPopupDisplay;
Component* parentForPopupDisplay = nullptr;
//==============================================================================
static double smallestAngleBetween (const double a1, const double a2) noexcept
@@ -1319,8 +1298,8 @@ void Slider::init (SliderStyle style, TextEntryBoxPosition textBoxPos)
Slider::~Slider() {}
//==============================================================================
void Slider::addListener (SliderListener* const listener) { pimpl->listeners.add (listener); }
void Slider::removeListener (SliderListener* const listener) { pimpl->listeners.remove (listener); }
void Slider::addListener (Listener* l) { pimpl->listeners.add (l); }
void Slider::removeListener (Listener* l) { pimpl->listeners.remove (l); }
//==============================================================================
Slider::SliderStyle Slider::getSliderStyle() const noexcept { return pimpl->style; }


+ 2
- 2
modules/juce_gui_basics/widgets/juce_Toolbar.cpp View File

@@ -705,8 +705,8 @@ private:
Toolbar& toolbar;
class CustomiserPanel : public Component,
private ComboBoxListener, // (can't use ComboBox::Listener due to idiotic VC2005 bug)
private ButtonListener
private ComboBox::Listener,
private Button::Listener
{
public:
CustomiserPanel (ToolbarItemFactory& tbf, Toolbar& bar, int optionFlags)


+ 1
- 1
modules/juce_gui_basics/widgets/juce_Toolbar.h View File

@@ -50,7 +50,7 @@ class ToolbarItemFactory;
class JUCE_API Toolbar : public Component,
public DragAndDropContainer,
public DragAndDropTarget,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/windows/juce_AlertWindow.h View File

@@ -41,7 +41,7 @@
@see ThreadWithProgressWindow
*/
class JUCE_API AlertWindow : public TopLevelWindow,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_gui_basics/windows/juce_DocumentWindow.cpp View File

@@ -24,7 +24,7 @@
==============================================================================
*/
class DocumentWindow::ButtonListenerProxy : public ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
class DocumentWindow::ButtonListenerProxy : public Button::Listener
{
public:
ButtonListenerProxy (DocumentWindow& w) : owner (w) {}


+ 1
- 1
modules/juce_gui_extra/misc/juce_ColourSelector.h View File

@@ -38,7 +38,7 @@
*/
class JUCE_API ColourSelector : public Component,
public ChangeBroadcaster,
protected SliderListener
protected Slider::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp View File

@@ -333,7 +333,7 @@ private:
//==============================================================================
class KeyMappingEditorComponent::TopLevelItem : public TreeViewItem,
public ButtonListener,
public Button::Listener,
private ChangeListener
{
public:


+ 1
- 1
modules/juce_gui_extra/misc/juce_LiveConstantEditor.h View File

@@ -107,7 +107,7 @@ namespace LiveConstantEditor
//==============================================================================
struct JUCE_API LivePropertyEditorBase : public Component,
private TextEditor::Listener,
private ButtonListener
private Button::Listener
{
LivePropertyEditorBase (LiveValueBase&, CodeDocument&);


+ 1
- 1
modules/juce_gui_extra/misc/juce_PreferencesPanel.h View File

@@ -45,7 +45,7 @@
for each of these pages.
*/
class JUCE_API PreferencesPanel : public Component,
private ButtonListener // (can't use Button::Listener due to idiotic VC2005 bug)
private Button::Listener
{
public:
//==============================================================================


+ 1
- 1
modules/juce_product_unlocking/marketplace/juce_OnlineUnlockForm.h View File

@@ -44,7 +44,7 @@
@see OnlineUnlockStatus
*/
class JUCE_API OnlineUnlockForm : public Component,
private ButtonListener
private Button::Listener
{
public:
/** Creates an unlock form that will work with the given status object.


Loading…
Cancel
Save